Merge remote branch 'upstream/master'

2012-02-07 10:22:55 -06:00 · 2012-02-07 10:22:55 -06:00 · 526d5881c7
commit 526d5881c7
parent 8f9006e594 87aabf3eca
2 changed files with 3 additions and 0 deletions
--- a/src/main/java/org/dynmap/bukkit/BukkitEventProcessor.java
+++ b/src/main/java/org/dynmap/bukkit/BukkitEventProcessor.java
@ -272,6 +272,8 @@ public class BukkitEventProcessor {

        @Override
        public void onPlayerChat(PlayerChatEvent event) {
+            if(event.isCancelled())
+                return;
            /* Call listeners */
            List<Listener> ll = event_handlers.get(event.getType());
            if(ll != null) {