From 9f223825067d5a5be7eb72c496a8aebc7a43452c Mon Sep 17 00:00:00 2001 From: bm01 Date: Tue, 12 Feb 2013 19:15:17 +0100 Subject: [PATCH] Restored original behavior of Salvage.isSalvageable It doesn't check for custom armors, I don't know if it's a bug or not Added isMinecraftTool and isMinecraftArmor for clarity --- .../com/gmail/nossr50/skills/repair/Salvage.java | 4 ++-- src/main/java/com/gmail/nossr50/util/ItemChecks.java | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/skills/repair/Salvage.java b/src/main/java/com/gmail/nossr50/skills/repair/Salvage.java index af306c063..dca2bbbc3 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/Salvage.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/Salvage.java @@ -141,10 +141,10 @@ public class Salvage { * @return true if the item is salvageable, false otherwise */ public static boolean isSalvageable(final ItemStack is) { - if (configInstance.getSalvageTools() && (ItemChecks.isTool(is) || ItemChecks.isStringTool(is) || is.getType() == Material.BUCKET)) { + if (configInstance.getSalvageTools() && (ItemChecks.isMinecraftArmor(is) || ItemChecks.isStringTool(is) || is.getType() == Material.BUCKET)) { return true; } - if (configInstance.getSalvageArmor() && ItemChecks.isArmor(is)) { + if (configInstance.getSalvageArmor() && ItemChecks.isMinecraftArmor(is)) { return true; } return false; diff --git a/src/main/java/com/gmail/nossr50/util/ItemChecks.java b/src/main/java/com/gmail/nossr50/util/ItemChecks.java index d341f4c24..d74066b93 100644 --- a/src/main/java/com/gmail/nossr50/util/ItemChecks.java +++ b/src/main/java/com/gmail/nossr50/util/ItemChecks.java @@ -257,6 +257,16 @@ public class ItemChecks { return isHelmet(is) || isChestplate(is) || isLeggings(is) || isBoots(is); } + /** + * Checks to see if an item is a wearable armor piece. + * + * @param is Item to check + * @return true if the item is armor, false otherwise + */ + public static boolean isMinecraftArmor(ItemStack is) { + return isDiamondArmor(is) || isGoldArmor(is) || isIronArmor(is) || isDiamondArmor(is); + } + /** * Checks to see if an item is a leather armor piece. * @@ -339,7 +349,7 @@ public class ItemChecks { * @param is Item to check * @return true if the item is a tool, false otherwise */ - public static boolean isTool(ItemStack is) { + public static boolean isMinecraftTool(ItemStack is) { return isStoneTool(is) || isWoodTool(is) || isGoldTool(is) || isIronTool(is) || isDiamondTool(is) || isStringTool(is); }