Removed MCPC+ workaround.

This has been fixed by MCPC+ starting with build 112.

Addresses #1549
This commit is contained in:
GJ 2013-10-31 13:28:54 -04:00
parent de3c4f8fd7
commit 88296da0af

View File

@ -84,36 +84,8 @@ public class Repair {
} }
} }
public static int getRepairAndSalvageQuantities(ItemStack inHand) { public static int getRepairAndSalvageQuantities(ItemStack item) {
// Temporary workaround until they get their stuff fixed. return getRepairAndSalvageQuantities(item, getRepairAndSalvageItem(item), (byte) -1);
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, Material repairMaterial, byte repairMetadata) { public static int getRepairAndSalvageQuantities(ItemStack item, Material repairMaterial, byte repairMetadata) {