Merge remote branch 'upstream/master'

This commit is contained in:
Mike Primm 2012-02-07 10:22:55 -06:00
commit 526d5881c7
2 changed files with 3 additions and 0 deletions

View File

@ -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) {

View File

@ -126,6 +126,7 @@ components:
type: coord
label: "Location"
hidey: false
show-mcr: false
#- class: org.dynmap.ClientComponent
# type: logo