From 9b31f30f146be0f0e2e55f67cdb03559ec1b5342 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Mon, 6 Feb 2012 20:31:41 -0600 Subject: [PATCH 1/2] Handle cancelled chat events properly --- src/main/java/org/dynmap/bukkit/BukkitEventProcessor.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/dynmap/bukkit/BukkitEventProcessor.java b/src/main/java/org/dynmap/bukkit/BukkitEventProcessor.java index 78eaebac..0e17c121 100644 --- 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 ll = event_handlers.get(event.getType()); if(ll != null) { From 87aabf3ecaf133e1f3c4bc96bbce134afcd1d712 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Tue, 7 Feb 2012 00:48:28 -0600 Subject: [PATCH 2/2] Add 'show-mcr' option to coord control (show region file ID) --- src/main/resources/configuration.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/configuration.txt b/src/main/resources/configuration.txt index 1e6cf952..29002af0 100644 --- a/src/main/resources/configuration.txt +++ b/src/main/resources/configuration.txt @@ -126,6 +126,7 @@ components: type: coord label: "Location" hidey: false + show-mcr: false #- class: org.dynmap.ClientComponent # type: logo