Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2025-02-19 05:11:38 +01:00
Code Issues Projects Releases Wiki Activity

Make web UI reload when configuration changes, server restarts

Browse Source
This commit is contained in:
Mike Primm 2011-11-30 12:31:15 +08:00 committed by mikeprimm
parent 4af95f57df
commit edcf1cfd10
4 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/dynmap/ClientConfigurationComponent.java
View File

@ -14,6 +14,7 @@ public class ClientConfigurationComponent extends Component {
@Override @Override
public void triggered(JSONObject t) { public void triggered(JSONObject t) {
ConfigurationNode c = plugin.configuration; ConfigurationNode c = plugin.configuration;
s(t, "confighash", plugin.getConfigHashcode());
s(t, "updaterate", c.getFloat("updaterate", 1.0f)); s(t, "updaterate", c.getFloat("updaterate", 1.0f));
s(t, "showplayerfacesinmenu", c.getBoolean("showplayerfacesinmenu", true)); s(t, "showplayerfacesinmenu", c.getBoolean("showplayerfacesinmenu", true));
s(t, "joinmessage", c.getString("joinmessage", "%playername% joined")); s(t, "joinmessage", c.getString("joinmessage", "%playername% joined"));

4
src/main/java/org/dynmap/ClientUpdateComponent.java
View File

@ -35,7 +35,9 @@ public class ClientUpdateComponent extends Component {
String worldName = world.getName(); String worldName = world.getName();
int hideifshadow = configuration.getInteger("hideifshadow", 15); int hideifshadow = configuration.getInteger("hideifshadow", 15);
int hideifunder = configuration.getInteger("hideifundercover", 15); int hideifunder = configuration.getInteger("hideifundercover", 15);
s(u, "confighash", plugin.getConfigHashcode());
s(u, "servertime", world.getTime() % 24000); s(u, "servertime", world.getTime() % 24000);
s(u, "hasStorm", world.hasStorm()); s(u, "hasStorm", world.hasStorm());
s(u, "isThundering", world.isThundering()); s(u, "isThundering", world.isThundering());

12
src/main/java/org/dynmap/DynmapPlugin.java
View File

@ -81,6 +81,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
boolean waterbiomeshading = false; boolean waterbiomeshading = false;
boolean fencejoin = false; boolean fencejoin = false;
public CompassMode compassmode = CompassMode.PRE19; public CompassMode compassmode = CompassMode.PRE19;
private int config_hashcode; /* Used to signal need to reload web configuration (world changes, config update, etc) */
public enum CompassMode { public enum CompassMode {
PRE19, /* Default for 1.8 and earlier (east is Z+) */ PRE19, /* Default for 1.8 and earlier (east is Z+) */
@ -297,6 +298,8 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
playerfacemgr = new PlayerFaces(this); playerfacemgr = new PlayerFaces(this);
updateConfigHashcode(); /* Initialize/update config hashcode */
loadWebserver(); loadWebserver();
enabledTriggers.clear(); enabledTriggers.clear();
@ -327,6 +330,14 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
events.<Object>trigger("initialized", null); events.<Object>trigger("initialized", null);
} }
public void updateConfigHashcode() {
config_hashcode = (int)System.currentTimeMillis();
}
public int getConfigHashcode() {
return config_hashcode;
}
public void loadWebserver() { public void loadWebserver() {
InetAddress bindAddress; InetAddress bindAddress;
{ {
@ -633,6 +644,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
@Override @Override
public void onWorldLoad(WorldLoadEvent event) { public void onWorldLoad(WorldLoadEvent event) {
mapManager.activateWorld(event.getWorld()); mapManager.activateWorld(event.getWorld());
updateConfigHashcode();
} }
}; };

4
web/js/map.js
View File

@ -526,6 +526,10 @@ DynMap.prototype = {
if (!me.options.jsonfile) { if (!me.options.jsonfile) {
me.lasttimestamp = update.timestamp; me.lasttimestamp = update.timestamp;
} }
if(me.options.confighash != update.confighash) {
window.location.reload(true);
return;
}
me.servertime = update.servertime; me.servertime = update.servertime;
var newserverday = (me.servertime > 23100 || me.servertime < 12900); var newserverday = (me.servertime > 23100 || me.servertime < 12900);