From 36976e632191327c42f518b57c7161ab63398ea9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Jan 2016 19:12:22 -0600 Subject: [PATCH] Fix divining rod looking up blocks with no item form in the OD. CLoses #57 --- .../java/vazkii/botania/common/item/rod/ItemDiviningRod.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index be2c3986d..92907bd98 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -14,6 +14,7 @@ import java.util.Random; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; @@ -62,6 +63,9 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW for(int k = -range; k < range + 1; k++) { BlockPos pos_ = pos.add(i, j, k); IBlockState state = world.getBlockState(pos_); + if (Item.getItemFromBlock(state.getBlock()) == null) { + continue; + } ItemStack orestack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)); for(int id : OreDictionary.getOreIDs(orestack)) { String s = OreDictionary.getOreName(id);