Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Corrected JsonFile use of webpath.

Browse source
This commit is contained in:
FrozenCow 2011-05-22 17:09:42 +02:00
parent 68c9e5b50c
commit eae96a5f39
1 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/main/java/org/dynmap/JsonFileClientUpdateComponent.java
View file

@ -54,15 +54,19 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
}); });
} }
protected File getStandaloneFile(String filename) {
File webpath = new File(plugin.configuration.getString("webpath", "web"), "standalone/" + filename);
if (webpath.isAbsolute())
return webpath;
else
return new File(plugin.getDataFolder(), webpath.toString());
}
protected void writeConfiguration() { protected void writeConfiguration() {
File outputFile; File outputFile;
JSONObject clientConfiguration = new JSONObject(); JSONObject clientConfiguration = new JSONObject();
plugin.events.trigger("buildclientconfiguration", clientConfiguration); plugin.events.trigger("buildclientconfiguration", clientConfiguration);
File webpath = new File(plugin.configuration.getString("webpath", "web"), "standalone/dynmap_config.json"); outputFile = getStandaloneFile("dynmap_config.json");
if (webpath.isAbsolute())
outputFile = webpath;
else
outputFile = new File(plugin.getDataFolder(), webpath.toString());
try { try {
FileOutputStream fos = new FileOutputStream(outputFile); FileOutputStream fos = new FileOutputStream(outputFile);
@ -89,12 +93,7 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
ClientUpdateEvent clientUpdate = new ClientUpdateEvent(current, dynmapWorld, update); ClientUpdateEvent clientUpdate = new ClientUpdateEvent(current, dynmapWorld, update);
plugin.events.trigger("buildclientupdate", clientUpdate); plugin.events.trigger("buildclientupdate", clientUpdate);
File webWorldPath = new File(this.configuration.getString("webpath", "web"), "standalone/dynmap_" + world.getName() + ".json"); outputFile = getStandaloneFile("dynmap_" + world.getName() + ".json");
if (webWorldPath.isAbsolute())
outputFile = webWorldPath;
else {
outputFile = new File(plugin.getDataFolder(), webWorldPath.toString());
}
try { try {
FileOutputStream fos = new FileOutputStream(outputFile); FileOutputStream fos = new FileOutputStream(outputFile);
fos.write(Json.stringifyJson(update).getBytes()); fos.write(Json.stringifyJson(update).getBytes());
@ -112,11 +111,7 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
} }
protected void handleWebChat() { protected void handleWebChat() {
File webPath = new File(configuration.getString("webpath", "web")); File webchatFile = getStandaloneFile("dynmap_webchat.json");
if (!webPath.isAbsolute()) {
webPath = new File(plugin.getDataFolder(), webPath.toString());
}
File webchatFile = new File(webPath, "standalone/dynmap_webchat.json");
if (webchatFile.exists() && lastTimestamp != 0) { if (webchatFile.exists() && lastTimestamp != 0) {
JSONArray jsonMsgs = null; JSONArray jsonMsgs = null;