Merge remote branch 'upstream/master'
This commit is contained in:
commit
526d5881c7
2 changed files with 3 additions and 0 deletions
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -126,6 +126,7 @@ components:
|
|||
type: coord
|
||||
label: "Location"
|
||||
hidey: false
|
||||
show-mcr: false
|
||||
|
||||
#- class: org.dynmap.ClientComponent
|
||||
# type: logo
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue