diff --git a/src/main/java/tconstruct/library/tools/AOEHarvestTool.java b/src/main/java/tconstruct/library/tools/AOEHarvestTool.java index 78b8502c..36bdbba3 100644 --- a/src/main/java/tconstruct/library/tools/AOEHarvestTool.java +++ b/src/main/java/tconstruct/library/tools/AOEHarvestTool.java @@ -6,6 +6,7 @@ import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.management.ItemInWorldManager; import net.minecraft.util.MovingObjectPosition; @@ -29,7 +30,12 @@ public abstract class AOEHarvestTool extends HarvestTool { // only effective materials matter. We don't want to aoe when beraking dirt with a hammer. Block block = player.worldObj.getBlock(x,y,z); int meta = player.worldObj.getBlockMetadata(x,y,z); - if(block == null || !isEffective(block, meta)) + if(block == null || !isEffective(block, meta) || !stack.hasTagCompound()) + return super.onBlockStartBreak(stack, x,y,z, player); + + // tool broken? + NBTTagCompound toolTags = stack.getTagCompound().getCompoundTag("InfiTool"); + if(toolTags == null || toolTags.getBoolean("Broken")) return super.onBlockStartBreak(stack, x,y,z, player); MovingObjectPosition mop = AbilityHelper.raytraceFromEntity(player.worldObj, player, false, 4.5d); diff --git a/src/main/java/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java index 01f864f1..4a63d1a4 100644 --- a/src/main/java/tconstruct/library/tools/HarvestTool.java +++ b/src/main/java/tconstruct/library/tools/HarvestTool.java @@ -58,7 +58,7 @@ public abstract class HarvestTool extends ToolCore NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); // broken tools suck. if (tags.getBoolean("Broken")) - return -1; + return 0; // tadaaaa return tags.getInteger("HarvestLevel");