From 88296da0af00b12cbbbe985ce51ee40f3677cec7 Mon Sep 17 00:00:00 2001 From: GJ Date: Thu, 31 Oct 2013 13:28:54 -0400 Subject: [PATCH] Removed MCPC+ workaround. This has been fixed by MCPC+ starting with build 112. Addresses #1549 --- .../gmail/nossr50/skills/repair/Repair.java | 32 ++----------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/skills/repair/Repair.java b/src/main/java/com/gmail/nossr50/skills/repair/Repair.java index 956f6c3f6..b91f9bd99 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/Repair.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/Repair.java @@ -84,36 +84,8 @@ public class Repair { } } - public static int getRepairAndSalvageQuantities(ItemStack inHand) { - // Temporary workaround until they get their stuff fixed. - if (mcMMO.isMCPCEnabled()) { - if (ItemUtils.isPickaxe(inHand) || ItemUtils.isAxe(inHand) || ItemUtils.isBow(inHand) || inHand.getType() == Material.BUCKET) { - return 3; - } - else if (ItemUtils.isShovel(inHand) || inHand.getType() == Material.FLINT_AND_STEEL) { - return 1; - } - else if (ItemUtils.isSword(inHand) || ItemUtils.isHoe(inHand) || inHand.getType() == Material.CARROT_STICK || inHand.getType() == Material.FISHING_ROD || inHand.getType() == Material.SHEARS) { - return 2; - } - else if (ItemUtils.isHelmet(inHand)) { - return 5; - } - else if (ItemUtils.isChestplate(inHand)) { - return 8; - } - else if (ItemUtils.isLeggings(inHand)) { - return 7; - } - else if (ItemUtils.isBoots(inHand)) { - return 4; - } - else { - return 0; - } - } - - return getRepairAndSalvageQuantities(inHand, getRepairAndSalvageItem(inHand), (byte) -1); + public static int getRepairAndSalvageQuantities(ItemStack item) { + return getRepairAndSalvageQuantities(item, getRepairAndSalvageItem(item), (byte) -1); } public static int getRepairAndSalvageQuantities(ItemStack item, Material repairMaterial, byte repairMetadata) {