Merge remote branch 'upstream/master'
This commit is contained in:
commit
093241877b
2 changed files with 3 additions and 0 deletions
|
|
@ -272,6 +272,8 @@ public class BukkitEventProcessor {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onPlayerChat(PlayerChatEvent event) {
|
public void onPlayerChat(PlayerChatEvent event) {
|
||||||
|
if(event.isCancelled())
|
||||||
|
return;
|
||||||
/* Call listeners */
|
/* Call listeners */
|
||||||
List<Listener> ll = event_handlers.get(event.getType());
|
List<Listener> ll = event_handlers.get(event.getType());
|
||||||
if(ll != null) {
|
if(ll != null) {
|
||||||
|
|
|
||||||
|
|
@ -126,6 +126,7 @@ components:
|
||||||
type: coord
|
type: coord
|
||||||
label: "Location"
|
label: "Location"
|
||||||
hidey: false
|
hidey: false
|
||||||
|
show-mcr: false
|
||||||
|
|
||||||
#- class: org.dynmap.ClientComponent
|
#- class: org.dynmap.ClientComponent
|
||||||
# type: logo
|
# type: logo
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue