Merge remote branch 'upstream/master' into HEAD

2011-07-19 00:53:02 -05:00 · 2011-07-19 00:53:02 -05:00 · 73825b4558
commit 73825b4558
parent 2c16c800e9 929a34656b
2 changed files with 4 additions and 0 deletions
--- a/src/main/java/org/dynmap/JsonFileClientUpdateComponent.java
+++ b/src/main/java/org/dynmap/JsonFileClientUpdateComponent.java
@ -57,6 +57,9 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
            public void triggered(JSONObject t) {
                s(t, "jsonfile", true);
                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>() {