Merge pull request #523 from ljfa-ag/patch-1

Fix #347 again...
This commit is contained in:
WayofTime 2015-12-31 11:36:08 -05:00
commit 789b3c2afb

View file

@ -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)