From 0a97c1dc62c1bde0999b8405a5670eb5ac9bfa1d Mon Sep 17 00:00:00 2001 From: nossr50 Date: Fri, 2 Mar 2012 11:31:30 -0800 Subject: [PATCH] Updating Tree Feller to use .getMaxDurability() API calls --- .../java/com/gmail/nossr50/skills/Repair.java | 16 ---------------- .../com/gmail/nossr50/skills/WoodCutting.java | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/skills/Repair.java b/src/main/java/com/gmail/nossr50/skills/Repair.java index 8c0fe2605..86132ac14 100644 --- a/src/main/java/com/gmail/nossr50/skills/Repair.java +++ b/src/main/java/com/gmail/nossr50/skills/Repair.java @@ -449,22 +449,6 @@ public class Repair { return false; } - public static short getMaxDurability(ItemStack is) - { - if(isDiamondTools(is)) - return (short) 1562; - else if(isIronTools(is)) - return (short) 251; - else if(isGoldTools(is)) - return (short) 33; - else if(isStoneTools(is)) - return (short) 132; - else if(isWoodTools(is)) - return (short) 66; - else - return 0; - } - public static boolean isBow(ItemStack is){ return is.getType() == Material.BOW; } diff --git a/src/main/java/com/gmail/nossr50/skills/WoodCutting.java b/src/main/java/com/gmail/nossr50/skills/WoodCutting.java index bcd0dd57e..228f53282 100644 --- a/src/main/java/com/gmail/nossr50/skills/WoodCutting.java +++ b/src/main/java/com/gmail/nossr50/skills/WoodCutting.java @@ -73,7 +73,7 @@ public class WoodCutting player.getItemInHand().setDurability((short) (player.getItemInHand().getDurability()+durabilityLoss)); //This is to prevent using wood axes everytime you tree fell - if(player.getItemInHand().getDurability() >= Repair.getMaxDurability(player.getItemInHand()) + if((player.getItemInHand().getDurability() >= player.getItemInHand().getType().getMaxDurability()) || player.getItemInHand().getType() == Material.AIR || player.getItemInHand() == null) { player.sendMessage(ChatColor.RED+"YOUR AXE SPLINTERS INTO DOZENS OF PIECES");