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

Fix exception in world ordering code when world not in worlds list

Browse source
This commit is contained in:
Mike Primm 2011-05-26 15:32:56 -05:00
parent e4628b2664
commit 51db1bda82
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/org/dynmap/MapManager.java
View file

@ -223,16 +223,20 @@ public class MapManager {
ConfigurationNode node = nodes.get(i); ConfigurationNode node = nodes.get(i);
indexLookup.put(node.getString("name"), i); indexLookup.put(node.getString("name"), i);
} }
int worldIndex = indexLookup.get(worldName); Integer worldIndex = indexLookup.get(worldName);
int insertIndex; if(worldIndex == null) {
for(insertIndex = 0; insertIndex < worlds.size(); insertIndex++) { worlds.add(dynmapWorld); /* Put at end if no world section */
Integer nextWorldIndex = indexLookup.get(worlds.get(insertIndex).world.getName()); }
if (nextWorldIndex == null || worldIndex < nextWorldIndex.intValue()) { else {
break; int insertIndex;
} for(insertIndex = 0; insertIndex < worlds.size(); insertIndex++) {
Integer nextWorldIndex = indexLookup.get(worlds.get(insertIndex).world.getName());
if (nextWorldIndex == null || worldIndex < nextWorldIndex.intValue()) {
break;
}
}
worlds.add(insertIndex, dynmapWorld);
} }
worlds.add(insertIndex, dynmapWorld);
worldsLookup.put(w.getName(), dynmapWorld); worldsLookup.put(w.getName(), dynmapWorld);
plug_in.events.trigger("worldactivated", dynmapWorld); plug_in.events.trigger("worldactivated", dynmapWorld);