Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-02-04 14:31:21 +01:00
Code Issues Projects Releases Wiki Activity

Made the island_name placeholders return default island name if no custom one is set

Browse Source 
Implements https://github.com/BentoBoxWorld/BentoBox/issues/1108
This commit is contained in:
Florian CUNY 2020-01-11 11:55:51 +01:00
parent ffa873be68
commit 9169242434
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/world/bentobox/bentobox/lists/GameModePlaceholder.java
View File

@ -5,6 +5,7 @@ import java.time.Instant;
import java.util.Date; import java.util.Date;
import java.util.Optional; import java.util.Optional;
import world.bentobox.bentobox.api.localization.TextVariables;
import world.bentobox.bentobox.api.placeholders.GameModePlaceholderReplacer; import world.bentobox.bentobox.api.placeholders.GameModePlaceholderReplacer;
import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.managers.RanksManager; import world.bentobox.bentobox.managers.RanksManager;
@ -43,9 +44,12 @@ public enum GameModePlaceholder {
ISLAND_OWNER("island_owner", (addon, user, island) -> island == null ? "" : addon.getPlayers().getName(island.getOwner())), ISLAND_OWNER("island_owner", (addon, user, island) -> island == null ? "" : addon.getPlayers().getName(island.getOwner())),
ISLAND_CREATION_DATE("island_creation_date", (addon, user, island) -> island == null ? "" : DateFormat.getInstance().format(Date.from(Instant.ofEpochMilli(island.getCreatedDate())))), ISLAND_CREATION_DATE("island_creation_date", (addon, user, island) -> island == null ? "" : DateFormat.getInstance().format(Date.from(Instant.ofEpochMilli(island.getCreatedDate())))),
ISLAND_NAME("island_name", (addon, user, island) -> { ISLAND_NAME("island_name", (addon, user, island) -> {
if (island == null || island.getName() == null) { if (island == null || user == null) {
return ""; return "";
} }
if (island.getName() == null) {
return user.getTranslation(island.getWorld(), "protection.flags.ENTER_EXIT_MESSAGES.island", TextVariables.NAME, addon.getPlayers().getName(island.getOwner()));
}
return island.getName(); return island.getName();
}), }),
/** /**
@ -153,7 +157,14 @@ public enum GameModePlaceholder {
return ""; return "";
} }
Optional<Island> visitedIsland = addon.getIslands().getIslandAt(user.getLocation()); Optional<Island> visitedIsland = addon.getIslands().getIslandAt(user.getLocation());
return visitedIsland.map(Island::getName).orElse("");
return visitedIsland.map(is -> {
if (is.getName() != null) {
return is.getName();
} else {
return user.getTranslation(is.getWorld(), "protection.flags.ENTER_EXIT_MESSAGES.island", TextVariables.NAME, addon.getPlayers().getName(is.getOwner()));
}
}).orElse("");
}), }),
/** /**
* Returns the coordinates of the center of the island the player is standing on. * Returns the coordinates of the center of the island the player is standing on.