From cb4136d350cc28f60111f662eb2bfa2871325c78 Mon Sep 17 00:00:00 2001 From: Kqliber Date: Sat, 1 Aug 2020 03:02:45 +0100 Subject: [PATCH] deprecated --- pom.xml | 2 +- .../expansion/townychat/TownyChatExpansion.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 2851763..fb67ebc 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ org.spigotmc spigot-api - 1.14-R0.1-SNAPSHOT + 1.16.1-R0.1-SNAPSHOT provided diff --git a/src/main/java/com/extendedclip/papi/expansion/townychat/TownyChatExpansion.java b/src/main/java/com/extendedclip/papi/expansion/townychat/TownyChatExpansion.java index 6e3c2a8..2822e3d 100644 --- a/src/main/java/com/extendedclip/papi/expansion/townychat/TownyChatExpansion.java +++ b/src/main/java/com/extendedclip/papi/expansion/townychat/TownyChatExpansion.java @@ -9,6 +9,7 @@ import com.palmergames.bukkit.towny.object.TownyUniverse; import me.clip.placeholderapi.expansion.Cleanable; import me.clip.placeholderapi.expansion.PlaceholderExpansion; +import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -44,15 +45,16 @@ public String getVersion() { } @Override - public String onPlaceholderRequest(Player p, String identifier) { + public String onRequest(OfflinePlayer p, String identifier) { + Player player = (Player) p; switch (identifier) { case "channel_tag": - return getChatPlayer(p).getTag(); + return getChatPlayer(player).getTag(); case "channel_name": - return getChatPlayer(p).getChannel(); + return getChatPlayer(player).getChannel(); case "message_color": - return getChatPlayer(p).getColor(); + return getChatPlayer(player).getColor(); } try { @@ -61,7 +63,7 @@ public String onPlaceholderRequest(Player p, String identifier) { switch (identifier) { case "world": - return String.format(ChatSettings.getWorldTag(), new Object[]{p.getWorld().getName()}); + return String.format(ChatSettings.getWorldTag(), new Object[]{player.getWorld().getName()}); case "town": return r.hasTown() ? r.getTown().getName() : ""; case "townformatted": @@ -99,7 +101,7 @@ public String onPlaceholderRequest(Player p, String identifier) { case "townycolor": return r.isMayor() ? ChatSettings.getMayorColour() : r.isKing() ? ChatSettings.getKingColour() : ChatSettings.getResidentColour(); case "group": - return TownyUniverse.getPermissionSource().getPlayerGroup(p); + return TownyUniverse.getPermissionSource().getPlayerGroup(player); case "permprefix": return TownyUniverse.getPermissionSource().getPrefixSuffix(r, "prefix"); case "permsuffix":