diff options
| author | durron597 <martin.jared@gmail.com> | 2011-01-05 08:17:34 -0500 |
|---|---|---|
| committer | durron597 <martin.jared@gmail.com> | 2011-01-05 08:17:34 -0500 |
| commit | 72c378f1d1974179a02a432b820e97802fc0f13b (patch) | |
| tree | 2121b2f8eec309af7cfa27e806bcdb5350928912 /src/main/java/net | |
| parent | b73e343dc18a341f3cb832b9f9b6588dbf91b053 (diff) | |
| parent | 786488603efdc6da423cbf3fdd1d7e7372fa4497 (diff) | |
| download | craftbukkit-72c378f1d1974179a02a432b820e97802fc0f13b.tar craftbukkit-72c378f1d1974179a02a432b820e97802fc0f13b.tar.gz craftbukkit-72c378f1d1974179a02a432b820e97802fc0f13b.tar.lz craftbukkit-72c378f1d1974179a02a432b820e97802fc0f13b.tar.xz craftbukkit-72c378f1d1974179a02a432b820e97802fc0f13b.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'src/main/java/net')
| -rw-r--r-- | src/main/java/net/minecraft/server/NetServerHandler.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java index 7cfe5ff5..2fd1c49f 100644 --- a/src/main/java/net/minecraft/server/NetServerHandler.java +++ b/src/main/java/net/minecraft/server/NetServerHandler.java @@ -419,6 +419,7 @@ implements ICommandListener { PlayerChatEvent event = new PlayerChatEvent(Type.PLAYER_CHAT, player, s); server.getPluginManager().callEvent(event); s = (new StringBuilder()).append("<").append(event.getPlayer().getName()).append("> ").append(event.getMessage()).toString(); + if (event.isCancelled()) return; // CraftBukkit stop a.info(s); |