From 0e43233e4642def82dc6908d1388599269befe28 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Fri, 28 Jun 2013 17:12:01 +0100 Subject: [PATCH] Add {TEAMPREFIX} {TEAMSUFFIX} and {TEAMNAME} to chat formatting. --- Essentials/src/com/earth2me/essentials/Settings.java | 3 +++ .../chat/EssentialsChatPlayerListenerLowest.java | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java index c92395849..211fa31e9 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/com/earth2me/essentials/Settings.java @@ -418,6 +418,9 @@ public class Settings implements ISettings mFormat = mFormat.replace("{GROUP}", "{0}"); mFormat = mFormat.replace("{WORLDNAME}", "{1}"); mFormat = mFormat.replace("{SHORTWORLDNAME}", "{2}"); + mFormat = mFormat.replace("{TEAMPREFIX}", "{3}"); + mFormat = mFormat.replace("{TEAMSUFFIX}", "{4}"); + mFormat = mFormat.replace("{TEAMNAME}", "{5}"); mFormat = "§r".concat(mFormat); chatFormats.put(group, mFormat); } diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java index efd3f5515..156a570f8 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java @@ -11,6 +11,8 @@ import org.bukkit.Server; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.AsyncPlayerChatEvent; +import org.bukkit.scoreboard.Scoreboard; +import org.bukkit.scoreboard.Team; public class EssentialsChatPlayerListenerLowest extends EssentialsChatPlayer @@ -48,10 +50,15 @@ public class EssentialsChatPlayerListenerLowest extends EssentialsChatPlayer event.setMessage(FormatUtil.formatMessage(user, "essentials.chat", event.getMessage())); String group = user.getGroup(); String world = user.getWorld().getName(); + Team team = user.getScoreboard().getPlayerTeam(user); + String format = ess.getSettings().getChatFormat(group); format = format.replace("{0}", group); format = format.replace("{1}", world); format = format.replace("{2}", world.substring(0, 1).toUpperCase(Locale.ENGLISH)); + format = format.replace("{3}", team == null ? "" : team.getPrefix()); + format = format.replace("{4}", team == null ? "" : team.getSuffix()); + format = format.replace("{5}", team == null ? "" : team.getDisplayName()); synchronized (format) { event.setFormat(format);