summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorEvilSeph <evilseph@gmail.com>2011-07-28 10:53:55 -0400
committerEvilSeph <evilseph@gmail.com>2011-08-03 12:10:08 -0400
commit817cd83f0b966356fcc5a058afe36c017aadaaac (patch)
treeaaea302b52d9c3d7727962f9d36bb01716cc6a50 /src/main/java
parent7d4ec8b1835648a2108a46480a3c2fd9e846fa0c (diff)
downloadcraftbukkit-817cd83f0b966356fcc5a058afe36c017aadaaac.tar
craftbukkit-817cd83f0b966356fcc5a058afe36c017aadaaac.tar.gz
craftbukkit-817cd83f0b966356fcc5a058afe36c017aadaaac.tar.lz
craftbukkit-817cd83f0b966356fcc5a058afe36c017aadaaac.tar.xz
craftbukkit-817cd83f0b966356fcc5a058afe36c017aadaaac.zip
Made PlayerAnimation cancellable. Thanks desmin88!
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/net/minecraft/server/NetServerHandler.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index b72a8119..4744063d 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();