Merge remote branch 'upstream/master' into HEAD

This commit is contained in:
Mike Primm 2011-07-19 00:53:02 -05:00
commit 73825b4558
2 changed files with 4 additions and 0 deletions

View File

@ -15,6 +15,7 @@ components:
# sendhealth: true # sendhealth: true
# sendposition: true # sendposition: true
# allowwebchat: false # allowwebchat: false
# webchat-interval: 5
# hidewebchatip: false # hidewebchatip: false
- class: org.dynmap.SimpleWebChatComponent - class: org.dynmap.SimpleWebChatComponent

View File

@ -57,6 +57,9 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
public void triggered(JSONObject t) { public void triggered(JSONObject t) {
s(t, "jsonfile", true); s(t, "jsonfile", true);
s(t, "allowwebchat", allowwebchat); s(t, "allowwebchat", allowwebchat);
// For 'sendmessage.php'
s(t, "webchat-interval", configuration.getFloat("webchat-interval", 5.0f));
} }
}); });
plugin.events.addListener("initialized", new Event.Listener<Object>() { plugin.events.addListener("initialized", new Event.Listener<Object>() {