EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-03 13:05:30 +02:00
Code Issues Projects Releases Wiki Activity

Workaround MCPC+ shortcomings for now.

Browse Source 
Fixes #1549
This commit is contained in:
GJ
2013-10-30 15:33:37 -04:00
parent 6c70de6a58
commit 4889769522
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/gmail/nossr50/skills/repair/Repair.java
View File

@@ -57,7 +57,7 @@ public class Repair {
return "";
}
protected static Material getSalvagedItem(ItemStack inHand) {
protected static Material getRepairAndSalvageItem(ItemStack inHand) {
if (ItemUtils.isDiamondTool(inHand) || ItemUtils.isDiamondArmor(inHand)) {
return Material.DIAMOND;
}
@@ -84,7 +84,7 @@ public class Repair {
}
}
protected static int getSalvagedAmount(ItemStack inHand) {
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) {
@@ -113,11 +113,7 @@ public class Repair {
}
}
return getRepairAndSalvageQuantities(inHand, getSalvagedItem(inHand), (byte) -1);
}
public static int getRepairAndSalvageQuantities(ItemStack item) {
return getRepairAndSalvageQuantities(item, null, (byte) -1);
return getRepairAndSalvageQuantities(inHand, getRepairAndSalvageItem(inHand), (byte) -1);
}
public static int getRepairAndSalvageQuantities(ItemStack item, Material repairMaterial, byte repairMetadata) {