From a104fe45aa330d03491c1eeff48b9f9847643cd0 Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Thu, 24 May 2012 08:38:44 -0400
Subject: [PATCH] Fix for NoCheatPlus fight.noswing checks

---
 Changelog.txt                                    | 3 +++
 src/main/java/com/gmail/nossr50/util/Combat.java | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Changelog.txt b/Changelog.txt
index f119b72ca..0e1de19e0 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -7,6 +7,9 @@ Key:
   ! Change
   - Removal
 
+Version 1.3.09
+ = Fixed issue with NoCheatPlus and Serrated Strikes / Skull Splitter (fight.noswing)
+
 Version 1.3.08
  + Added more notifications about Vampirism and Hardcore mode on player death
  + Added information about Hardcore mode when joining a server running Hardcore mode
diff --git a/src/main/java/com/gmail/nossr50/util/Combat.java b/src/main/java/com/gmail/nossr50/util/Combat.java
index 864f9a0f7..54a76759b 100644
--- a/src/main/java/com/gmail/nossr50/util/Combat.java
+++ b/src/main/java/com/gmail/nossr50/util/Combat.java
@@ -14,6 +14,7 @@ import org.bukkit.entity.Wolf;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.player.PlayerAnimationEvent;
 import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.mcMMO;
@@ -386,6 +387,9 @@ public class Combat {
                 break;
             }
 
+            PlayerAnimationEvent armswing = new PlayerAnimationEvent(attacker);
+            plugin.getServer().getPluginManager().callEvent(armswing);
+
             if (entity instanceof Player) {
                 Player defender = (Player) entity;
 
@@ -406,7 +410,8 @@ public class Combat {
                 if (playerProfile.getGodMode()) {
                     continue;
                 }
-            } else if (entity instanceof Tameable) {
+            }
+            else if (entity instanceof Tameable) {
                 AnimalTamer tamer = ((Tameable) entity).getOwner();
 
                 if (tamer instanceof Player) {