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

Fix #347 again...

Browse source 
Lit redstone ore has no item attached to it, so the method was wrongly returning false after I added the null item check
This commit is contained in:
ljfa 2015-12-29 20:55:49 +01:00
parent d5dc5bf328
commit a30b908e80
1 changed files with 4 additions and 3 deletions
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)