Alter the order that outposts are marked, use outpost naming.

Closes TownyAdvanced/Towny#7451 Closes TownyAdvanced/Towny#7450
TownyAdvanced · Jun 7, 2024 · 6d2bf61 · 6d2bf61
1 parent 872b83e
commit 6d2bf61
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/main/java/org/dynmap/towny/mapupdate/UpdateTowns.java b/src/main/java/org/dynmap/towny/mapupdate/UpdateTowns.java
@@ -428,9 +428,11 @@ private void addStyle(Town town, AreaMarker m, TownBlockType btype) {
 	 */
 
 	private void drawTownMarkers(Town town, Map<String, Marker> newWorldNameMarkerMap, String townName, String desc) {
+		if (town.hasOutpostSpawn())
+			drawOutpostIcons(town, newWorldNameMarkerMap, desc);
+
 		/* Now, add marker for home block */
 		TownBlock homeBlock = town.getHomeBlockOrNull();
-
 		if (homeBlock != null && isVisible(townName, homeBlock.getWorld().getName())) {
 			MarkerIcon townHomeBlockIcon = getMarkerIcon(town);
 
@@ -443,8 +445,6 @@ private void drawTownMarkers(Town town, Map<String, Marker> newWorldNameMarkerMa
 				drawHomeBlockSpawn(newWorldNameMarkerMap, townName, desc, homeBlock, townHomeBlockIcon);
 		}
 
-		if (town.hasOutpostSpawn())
-			drawOutpostIcons(town, newWorldNameMarkerMap, desc);
 	}
 
 	private MarkerIcon getMarkerIcon(Town town) {
@@ -492,8 +492,9 @@ private void drawOutpostIcons(Town town, Map<String, Marker> newWorldNameMarkerM
 
 			double xx = TOWNBLOCKSIZE * townBlock.getX() + (TOWNBLOCKSIZE / 2);
 			double zz = TOWNBLOCKSIZE * townBlock.getZ() + (TOWNBLOCKSIZE / 2);
-			String outpostName = town.getName() + "_Outpost_" + i;
-			String outpostMarkerID = outpostName;
+			String outpostMarkerID = town.getName() + "_Outpost_" + i;
+			String outpostName = town.getName() + " Outpost" +  
+					(townBlock.getName().isEmpty() ? " " + i : ": " + townBlock.getName());
 			Marker outpostMarker = existingMarkers.remove(outpostMarkerID);
 			if (outpostMarker == null) {
 				outpostMarker = set.createMarker(outpostMarkerID, outpostName, townBlock.getWorld().getName(), xx, 64, zz, outpostIco, true);