Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/main/java/org/dynmap/towny/mapupdate/UpdateTowns.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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) {
Expand Down Expand Up @@ -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);
Expand Down