From a30b908e80cc3b177c674311e477bfaa987127a5 Mon Sep 17 00:00:00 2001 From: ljfa Date: Tue, 29 Dec 2015 20:55:49 +0100 Subject: [PATCH] Fix #347 again... Lit redstone ore has no item attached to it, so the method was wrongly returning false after I added the null item check --- .../common/rituals/RitualEffectMagnetic.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectMagnetic.java b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectMagnetic.java index 6c2a925d..4068674f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectMagnetic.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectMagnetic.java @@ -33,12 +33,13 @@ public class RitualEffectMagnetic extends RitualEffect public static boolean isBlockOre(Block block, int meta) { - if (block == null || Item.getItemFromBlock(block) == null) - return false; - + //Special case for lit redstone ore if (block instanceof BlockOre || block instanceof BlockRedstoneOre) return true; + if (block == null || Item.getItemFromBlock(block) == null) + return false; + ItemType type = new ItemType(block, meta); Boolean result = oreBlockCache.get(type); if (result == null)