From d401a69560877977e9fa84af2b7fa1c55107618e Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Tue, 6 Mar 2012 14:27:34 -0500
Subject: [PATCH] Fixed NoCheat issue (again).

---
 src/main/java/com/gmail/nossr50/Combat.java            |  2 +-
 src/main/java/com/gmail/nossr50/skills/Mining.java     | 10 +++++++---
 .../java/com/gmail/nossr50/skills/WoodCutting.java     |  3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/Combat.java b/src/main/java/com/gmail/nossr50/Combat.java
index a415f0dc9..537517653 100644
--- a/src/main/java/com/gmail/nossr50/Combat.java
+++ b/src/main/java/com/gmail/nossr50/Combat.java
@@ -323,7 +323,7 @@ public class Combat
 		
 	  	PlayerProfile PPd = Users.getProfile(defender);
 	  	
-   		if(System.currentTimeMillis() >= (PPd.getRespawnATS()*1000) + 5000 
+   		if(System.currentTimeMillis() >= (PPd.getRespawnATS()*1000) + 5000
   				&& ((PPd.getLastLogin()+5)*1000) < System.currentTimeMillis()
    				&& defender.getHealth() >= 1)
    		{
diff --git a/src/main/java/com/gmail/nossr50/skills/Mining.java b/src/main/java/com/gmail/nossr50/skills/Mining.java
index 6671fe125..2598ff068 100644
--- a/src/main/java/com/gmail/nossr50/skills/Mining.java
+++ b/src/main/java/com/gmail/nossr50/skills/Mining.java
@@ -16,6 +16,7 @@
 */
 package com.gmail.nossr50.skills;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -23,6 +24,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.getspout.spoutapi.sound.SoundEffect;
 import org.bukkit.enchantments.Enchantment;
+import org.bukkit.event.player.PlayerAnimationEvent;
 
 import com.gmail.nossr50.Users;
 import com.gmail.nossr50.m;
@@ -33,7 +35,7 @@ import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 
 
-public class Mining 
+public class Mining
 {	
 
 	public static void miningDrops(Block block)
@@ -145,7 +147,7 @@ public class Mining
     {
     	int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.MINING);
 
-    	if(skillLevel > 1000 || (Math.random() * 1000 <= skillLevel)) 
+    	if(skillLevel > 1000 || (Math.random() * 1000 <= skillLevel))
 	    	blockProcSimulate(block, player);
 	}
     
@@ -188,7 +190,8 @@ public class Mining
     	Material type = block.getType();
     	int tier = m.getTier(player);
     	int durabilityLoss = LoadProperties.abilityDurabilityLoss;
-    	
+    	PlayerAnimationEvent armswing = new PlayerAnimationEvent(player);
+		
 		switch(type)
 		{
 		case OBSIDIAN:
@@ -214,6 +217,7 @@ public class Mining
 		case STONE:
 			if((block.getData() == (byte) 5) || plugin.misc.blockWatchList.contains(block))
 				return;
+			Bukkit.getPluginManager().callEvent(armswing);
 			Skills.abilityDurabilityLoss(player.getItemInHand(), durabilityLoss);
 			blockProcCheck(block, player);
     		blockProcCheck(block, player);
diff --git a/src/main/java/com/gmail/nossr50/skills/WoodCutting.java b/src/main/java/com/gmail/nossr50/skills/WoodCutting.java
index 1aee67d65..a0d0ea841 100644
--- a/src/main/java/com/gmail/nossr50/skills/WoodCutting.java
+++ b/src/main/java/com/gmail/nossr50/skills/WoodCutting.java
@@ -264,7 +264,8 @@ public class WoodCutting
 		
     	PlayerAnimationEvent armswing = new PlayerAnimationEvent(player);
     	Bukkit.getPluginManager().callEvent(armswing);
-		Skills.abilityDurabilityLoss(player.getItemInHand(), LoadProperties.abilityDurabilityLoss);
+    	if(LoadProperties.woodcuttingrequiresaxe)
+    		Skills.abilityDurabilityLoss(player.getItemInHand(), LoadProperties.abilityDurabilityLoss);
 		if(LoadProperties.spoutEnabled)
 			SpoutStuff.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
     }