From e722c53a2297d359299ae32368314064549d2757 Mon Sep 17 00:00:00 2001 From: PainOchoco Date: Sun, 16 Oct 2022 16:18:55 +0200 Subject: [PATCH 1/3] Added %townyadvanced_is_trusted% placeholder --- .../palmergames/bukkit/towny/TownyPlaceholderExpansion.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/palmergames/bukkit/towny/TownyPlaceholderExpansion.java b/src/com/palmergames/bukkit/towny/TownyPlaceholderExpansion.java index da22e3da0a..fe647a3978 100644 --- a/src/com/palmergames/bukkit/towny/TownyPlaceholderExpansion.java +++ b/src/com/palmergames/bukkit/towny/TownyPlaceholderExpansion.java @@ -482,6 +482,11 @@ else if (!town.isEmpty()) return String.valueOf(resident.hasTown()); case "has_nation": // %townyadvanced_has_nation% return String.valueOf(resident.hasNation()); + case "is_trusted": // %townyadvanced_is_trusted% + if (resident.hasTown()) { + return String.valueOf(resident.getTownOrNull().getTrustedResidents().contains(resident)); + } + return ""; case "nation_tag_town_formatted": // %townyadvanced_nation_tag_town_formatted% if (resident.hasTown()) { town = resident.getTownOrNull().getFormattedName(); From c2e2dd3d564bb851498d7ea2041ad74ca98fb83d Mon Sep 17 00:00:00 2001 From: PainOchoco Date: Sun, 16 Oct 2022 16:33:18 +0200 Subject: [PATCH 2/3] Fix --- .../bukkit/towny/TownyPlaceholderExpansion.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/com/palmergames/bukkit/towny/TownyPlaceholderExpansion.java b/src/com/palmergames/bukkit/towny/TownyPlaceholderExpansion.java index fe647a3978..2e5e595dd1 100644 --- a/src/com/palmergames/bukkit/towny/TownyPlaceholderExpansion.java +++ b/src/com/palmergames/bukkit/towny/TownyPlaceholderExpansion.java @@ -482,11 +482,6 @@ else if (!town.isEmpty()) return String.valueOf(resident.hasTown()); case "has_nation": // %townyadvanced_has_nation% return String.valueOf(resident.hasNation()); - case "is_trusted": // %townyadvanced_is_trusted% - if (resident.hasTown()) { - return String.valueOf(resident.getTownOrNull().getTrustedResidents().contains(resident)); - } - return ""; case "nation_tag_town_formatted": // %townyadvanced_nation_tag_town_formatted% if (resident.hasTown()) { town = resident.getTownOrNull().getFormattedName(); @@ -647,6 +642,8 @@ private String getPlayerPlaceholder(Player player, String identifier) { return townblock != null ? townblock.getTownOrNull().getBoard() : ""; case "player_location_nation_board": // %townyadvanced_player_location_nation_board% return townblock != null ? (townblock.getTownOrNull().hasNation() ? townblock.getTownOrNull().getNationOrNull().getBoard() : "") : ""; + case "is_trusted": // %townyadvanced_player_is_trusted% + return townblock != null ? String.valueOf(townblock.getTownOrNull().hasTrustedResident(resident)) : ""; case "number_of_towns_in_world": // %townyadvanced_number_of_towns_in_world% return String.valueOf(TownyUniverse.getInstance().getTowns().stream() .filter(t -> t.getHomeblockWorld().equals(townblock.getWorld())) From 3777773e008ac0e325c58b65e8848670630ea291 Mon Sep 17 00:00:00 2001 From: PainOchoco Date: Sun, 16 Oct 2022 16:58:32 +0200 Subject: [PATCH 3/3] Added plot placeholder and renamed the town one --- .../palmergames/bukkit/towny/TownyPlaceholderExpansion.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/palmergames/bukkit/towny/TownyPlaceholderExpansion.java b/src/com/palmergames/bukkit/towny/TownyPlaceholderExpansion.java index 2e5e595dd1..999432d287 100644 --- a/src/com/palmergames/bukkit/towny/TownyPlaceholderExpansion.java +++ b/src/com/palmergames/bukkit/towny/TownyPlaceholderExpansion.java @@ -612,6 +612,8 @@ private String getPlayerPlaceholder(Player player, String identifier) { return townblock != null ? StringMgmt.capitalize(townblock.getType().toString()) : ""; case "player_plot_owner": // %townyadvanced_player_plot_owner% return townblock != null ? String.valueOf(townblock.isOwner(resident)) : "false"; + case "player_plot_is_trusted": // %townyadvanced_player_plot_is_trusted% + return townblock != null ? String.valueOf(townblock.hasTrustedResident(resident)) : ""; case "player_location_town_or_wildname": // %townyadvanced_player_location_town_or_wildname% return townblock != null ? townblock.getTownOrNull().getName() : TownyAPI.getInstance().getTownyWorld(player.getWorld().getName()).getUnclaimedZoneName(); case "player_location_formattedtown_or_wildname": // %townyadvanced_player_location_formattedtown_or_wildname% @@ -642,7 +644,7 @@ private String getPlayerPlaceholder(Player player, String identifier) { return townblock != null ? townblock.getTownOrNull().getBoard() : ""; case "player_location_nation_board": // %townyadvanced_player_location_nation_board% return townblock != null ? (townblock.getTownOrNull().hasNation() ? townblock.getTownOrNull().getNationOrNull().getBoard() : "") : ""; - case "is_trusted": // %townyadvanced_player_is_trusted% + case "player_town_is_trusted": // %townyadvanced_player_town_is_trusted% return townblock != null ? String.valueOf(townblock.getTownOrNull().hasTrustedResident(resident)) : ""; case "number_of_towns_in_world": // %townyadvanced_number_of_towns_in_world% return String.valueOf(TownyUniverse.getInstance().getTowns().stream()