lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

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

Browse source 
Fix #347 again...
This commit is contained in:
WayofTime 2015-12-31 11:36:08 -05:00
parent d5dc5bf328 a30b908e80
commit 789b3c2afb
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectMagnetic.java
View file

@ -33,12 +33,13 @@ public class RitualEffectMagnetic extends RitualEffect
public static boolean isBlockOre(Block block, int meta) public static boolean isBlockOre(Block block, int meta)
{ {
if (block == null || Item.getItemFromBlock(block) == null) //Special case for lit redstone ore
return false;
if (block instanceof BlockOre || block instanceof BlockRedstoneOre) if (block instanceof BlockOre || block instanceof BlockRedstoneOre)
return true; return true;
if (block == null || Item.getItemFromBlock(block) == null)
return false;
ItemType type = new ItemType(block, meta); ItemType type = new ItemType(block, meta);
Boolean result = oreBlockCache.get(type); Boolean result = oreBlockCache.get(type);
if (result == null) if (result == null)