From 5127d26111194b9c194714be0f48591d6e025d7e Mon Sep 17 00:00:00 2001 From: LlmDl Date: Tue, 4 Jun 2024 07:46:26 -0500 Subject: [PATCH] - Fix the relational placeholder that showed conquered status not being used for the player which are conquered. --- .../bukkit/towny/hooks/TownyPlaceholderExpansion.java | 2 +- Towny/src/main/resources/ChangeLog.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Towny/src/main/java/com/palmergames/bukkit/towny/hooks/TownyPlaceholderExpansion.java b/Towny/src/main/java/com/palmergames/bukkit/towny/hooks/TownyPlaceholderExpansion.java index 0a184071ab..ffd9085de0 100644 --- a/Towny/src/main/java/com/palmergames/bukkit/towny/hooks/TownyPlaceholderExpansion.java +++ b/Towny/src/main/java/com/palmergames/bukkit/towny/hooks/TownyPlaceholderExpansion.java @@ -135,7 +135,7 @@ private String getRelationalPlaceholder(Player player, Player player2, String id else if (CombatUtil.isSameTown(res, res2)) return TownySettings.getPAPIRelationSameTown(); else if (CombatUtil.isSameNation(res, res2)) - return res2.getTownOrNull().isConquered() ? TownySettings.getPAPIRelationConqueredTown() : TownySettings.getPAPIRelationSameNation(); + return res2.getTownOrNull().isConquered() || res.getTownOrNull().isConquered() ? TownySettings.getPAPIRelationConqueredTown() : TownySettings.getPAPIRelationSameNation(); else if (CombatUtil.isAlly(res, res2)) return TownySettings.getPAPIRelationAlly(); else if (CombatUtil.isEnemy(res, res2)) diff --git a/Towny/src/main/resources/ChangeLog.txt b/Towny/src/main/resources/ChangeLog.txt index d00dabd754..fe96e16469 100644 --- a/Towny/src/main/resources/ChangeLog.txt +++ b/Towny/src/main/resources/ChangeLog.txt @@ -9798,4 +9798,5 @@ v0.92.0.11: - Bump org.apache.commons:commons-compress from 1.26.1 to 1.26.2. - Bump me.clip:placeholderapi from 2.11.5 to 2.11.6. 0.100.2.13: - - Improve a couple SQL operations, courtesy of xyzeva with PR #7438. (First-Time Contributor!) \ No newline at end of file + - Improve a couple SQL operations, courtesy of xyzeva with PR #7438. (First-Time Contributor!) + - Fix the relational placeholder that showed conquered status not being used for the player which are conquered. \ No newline at end of file