From db702807e3e329bdb7664bf7d65d2a63d3bb03e0 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sun, 10 Aug 2014 16:49:11 +0200 Subject: [PATCH] Have the IToolPart implementations actually respect the IToolPart API. (-1 on invalid material) --- src/main/java/tconstruct/tools/items/Bowstring.java | 2 ++ src/main/java/tconstruct/tools/items/Fletching.java | 2 ++ src/main/java/tconstruct/tools/items/ToolPart.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/main/java/tconstruct/tools/items/Bowstring.java b/src/main/java/tconstruct/tools/items/Bowstring.java index eb2d6e98..edbcf99a 100644 --- a/src/main/java/tconstruct/tools/items/Bowstring.java +++ b/src/main/java/tconstruct/tools/items/Bowstring.java @@ -40,6 +40,8 @@ public class Bowstring extends CraftingItem implements IToolPart @Override public int getMaterialID (ItemStack stack) { + if(stack.getItemDamage() >= toolMaterialNames.length) + return -1; return stack.getItemDamage(); } diff --git a/src/main/java/tconstruct/tools/items/Fletching.java b/src/main/java/tconstruct/tools/items/Fletching.java index 3da80322..5e71f4cb 100644 --- a/src/main/java/tconstruct/tools/items/Fletching.java +++ b/src/main/java/tconstruct/tools/items/Fletching.java @@ -34,6 +34,8 @@ public class Fletching extends CraftingItem implements IToolPart @Override public int getMaterialID (ItemStack stack) { + if(stack.getItemDamage() >= toolMaterialNames.length) + return -1; return stack.getItemDamage(); } } diff --git a/src/main/java/tconstruct/tools/items/ToolPart.java b/src/main/java/tconstruct/tools/items/ToolPart.java index 7c02b78b..a10495c6 100644 --- a/src/main/java/tconstruct/tools/items/ToolPart.java +++ b/src/main/java/tconstruct/tools/items/ToolPart.java @@ -81,6 +81,8 @@ public class ToolPart extends CraftingItem implements IToolPart @Override public int getMaterialID (ItemStack stack) { + if(stack.getItemDamage() >= toolMaterialNames.length) + return -1; return stack.getItemDamage(); } }