Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-28 21:25:46 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
Mike Primm 2011-05-21 01:30:07 -05:00
commit b108cad2d3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/dynmap/ConfigurationNode.java
View File

@ -27,7 +27,7 @@ public class ConfigurationNode implements Map<String, Object> {
int separator = path.indexOf('/'); int separator = path.indexOf('/');
if (separator < 0) if (separator < 0)
return get(path); return get(path);
String localKey = path.substring(0, separator - 1); String localKey = path.substring(0, separator);
Object subvalue = get(localKey); Object subvalue = get(localKey);
if (subvalue == null) if (subvalue == null)
return null; return null;

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

@ -143,7 +143,7 @@ public class DynmapPlugin extends JavaPlugin {
webServer.handlers.put("/up/", new ClientUpdateHandler(mapManager, playerList, getServer(), configuration.getBoolean("health-in-json", false))); webServer.handlers.put("/up/", new ClientUpdateHandler(mapManager, playerList, getServer(), configuration.getBoolean("health-in-json", false)));
webServer.handlers.put("/up/configuration", new ClientConfigurationHandler(configuration.getNode("web"))); webServer.handlers.put("/up/configuration", new ClientConfigurationHandler(configuration.getNode("web")));
/* See if regions configuration branch is present */ /* See if regions configuration branch is present */
for(ConfigurationNode type : configuration.getNode("web").getNodes("components")) { for(ConfigurationNode type : configuration.getNodes("web/components")) {
if(type.getString("type").equalsIgnoreCase("regions")) { if(type.getString("type").equalsIgnoreCase("regions")) {
String fname = type.getString("filename", "regions.yml"); String fname = type.getString("filename", "regions.yml");
fname = "/standalone/" + fname.substring(0, fname.lastIndexOf('.')) + "_"; /* Find our path base */ fname = "/standalone/" + fname.substring(0, fname.lastIndexOf('.')) + "_"; /* Find our path base */