diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index b72a8119fe..4744063d56 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -785,6 +785,8 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
             // Arm swing animation
             PlayerAnimationEvent event = new PlayerAnimationEvent(this.getPlayer());
             this.server.getPluginManager().callEvent(event);
+
+            if (event.isCancelled()) return;
             // CraftBukkit end
 
             this.player.w();