Browse Source

Removed unnecessary calls

bm01 12 years ago
parent
commit
0545ed434d

+ 1 - 1
src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java

@@ -128,7 +128,7 @@ public class Excavation {
         if (player == null)
         if (player == null)
             return;
             return;
 
 
-        Skills.abilityDurabilityLoss(player.getItemInHand(), Config.getInstance().getAbilityToolDamage());
+        Skills.abilityDurabilityLoss(player.getItemInHand(), Misc.toolDurabilityLoss);
 
 
         if (!mcMMO.placeStore.isTrue(block) && Misc.blockBreakSimulate(block, player, true)) {
         if (!mcMMO.placeStore.isTrue(block) && Misc.blockBreakSimulate(block, player, true)) {
             FakePlayerAnimationEvent armswing = new FakePlayerAnimationEvent(player);
             FakePlayerAnimationEvent armswing = new FakePlayerAnimationEvent(player);

+ 4 - 4
src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java

@@ -492,7 +492,7 @@ public class WoodCutting {
         mcMMO.p.getServer().getPluginManager().callEvent(armswing);
         mcMMO.p.getServer().getPluginManager().callEvent(armswing);
 
 
         if (Config.getInstance().getWoodcuttingRequiresTool()) {
         if (Config.getInstance().getWoodcuttingRequiresTool()) {
-            Skills.abilityDurabilityLoss(player.getItemInHand(), Config.getInstance().getAbilityToolDamage());
+            Skills.abilityDurabilityLoss(player.getItemInHand(), Misc.toolDurabilityLoss);
         }
         }
 
 
         if (mcMMO.spoutEnabled) {
         if (mcMMO.spoutEnabled) {
@@ -503,9 +503,9 @@ public class WoodCutting {
     private static int durabilityLossCalulate(ArrayList<Block> toBeFelled, int level) {
     private static int durabilityLossCalulate(ArrayList<Block> toBeFelled, int level) {
         int durabilityLoss = 0;
         int durabilityLoss = 0;
         for (Block x : toBeFelled) {
         for (Block x : toBeFelled) {
-        	if (Misc.getRandom().nextInt(level + 1) > 0) {}//Don't add durabilityLoss, because Unbreaking enchantment does it's work.
-        	else if (x.getType().equals(Material.LOG) || (Config.getInstance().getBlockModsEnabled() && ModChecks.isCustomLogBlock(x))) {
-                durabilityLoss = durabilityLoss + Config.getInstance().getAbilityToolDamage();
+            if (Misc.getRandom().nextInt(level + 1) > 0) {}//Don't add durabilityLoss, because Unbreaking enchantment does it's work.
+            else if (x.getType().equals(Material.LOG) || (Config.getInstance().getBlockModsEnabled() && ModChecks.isCustomLogBlock(x))) {
+                durabilityLoss += Misc.toolDurabilityLoss;
             }
             }
         }
         }