EpicKnarvik97/Dynmap-Factions
EpicKnarvik97/Dynmap-Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix exception on home markers with same faction name in different universe

Browse Source
This commit is contained in:
Mike Primm 2013-08-25 10:23:04 -05:00
parent f91fab7bd3
commit 1d71852a81
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/dynmap/factions/DynmapFactionsPlugin.java
View File

@ -512,7 +512,7 @@ public class DynmapFactionsPlugin extends JavaPlugin {
/* Now, add marker for home location */ /* Now, add marker for home location */
PS homeloc = fact.getHome(); PS homeloc = fact.getHome();
if(homeloc != null) { if(homeloc != null) {
String markid = factname + "__home"; String markid = fc.getUniverse() + "_" + factname + "__home";
MarkerIcon ico = getMarkerIcon(factname, fact); MarkerIcon ico = getMarkerIcon(factname, fact);
if(ico != null) { if(ico != null) {
Marker home = resmark.remove(markid); Marker home = resmark.remove(markid);
@ -526,12 +526,14 @@ public class DynmapFactionsPlugin extends JavaPlugin {
home.setLabel(lbl); /* Update label */ home.setLabel(lbl); /* Update label */
home.setMarkerIcon(ico); home.setMarkerIcon(ico);
} }
if (home != null) {
home.setDescription(formatInfoWindow(fact)); /* Set popup */ home.setDescription(formatInfoWindow(fact)); /* Set popup */
newmark.put(markid, home); newmark.put(markid, home);
} }
} }
} }
} }
}
blocks_by_faction.clear(); blocks_by_faction.clear();
/* Now, review old map - anything left is gone */ /* Now, review old map - anything left is gone */