From 2f33bd0000e54a73e91b55d36da9819bc7aee6a4 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Mon, 6 Oct 2014 10:05:54 +0200 Subject: [PATCH] Fix chiseling depending on the itemdamage of the chisel o_O --- .../tconstruct/library/crafting/ShapelessToolRecipe.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java b/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java index 78854012..2ee4d956 100644 --- a/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java +++ b/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java @@ -37,15 +37,19 @@ public class ShapelessToolRecipe extends ShapelessRecipes ItemStack itemstack1 = (ItemStack) iterator.next(); // TConstruct.logger.info("Rawr! "+itemstack1.getItemDamage()); - if (itemstack.getItem() == itemstack1.getItem() && (itemstack1.getItemDamage() == Short.MAX_VALUE || itemstack.getItemDamage() == itemstack1.getItemDamage())) + if (itemstack.getItem() == itemstack1.getItem()) { if (itemstack.getItem() instanceof ToolCore) { NBTTagCompound tags = itemstack.getTagCompound().getCompoundTag("InfiTool"); if (tags.getBoolean("Broken")) return false; + + flag = true; } - flag = true; + else if((itemstack1.getItemDamage() == Short.MAX_VALUE || itemstack.getItemDamage() == itemstack1.getItemDamage())) + flag = true; + arraylist.remove(itemstack1); break; }