From 0e43233e4642def82dc6908d1388599269befe28 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Fri, 28 Jun 2013 17:12:01 +0100 Subject: Add {TEAMPREFIX} {TEAMSUFFIX} and {TEAMNAME} to chat formatting. --- .../essentials/chat/EssentialsChatPlayerListenerLowest.java | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'EssentialsChat') 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); -- cgit v1.2.3 From 3d29248ace7758d55a39d4247597abf0944b5145 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sun, 7 Jul 2013 12:11:57 +0100 Subject: Misc cleanup --- .../earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'EssentialsChat') diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java index 156a570f8..7eaaf2e0f 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java @@ -50,7 +50,7 @@ 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); + Team team = user.getScoreboard().getPlayerTeam(user.getBase()); String format = ess.getSettings().getChatFormat(group); format = format.replace("{0}", group); -- cgit v1.2.3 From 1abacf00dfa6c41feab083779a5fa5cea713ce4e Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sun, 7 Jul 2013 13:02:40 +0100 Subject: More cleanup --- .../src/com/earth2me/essentials/chat/EssentialsChatPlayer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'EssentialsChat') diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java index 8ca1e0726..83996ea21 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java @@ -114,7 +114,7 @@ public abstract class EssentialsChatPlayer implements Listener } catch (ChargeException e) { - ess.showError(chatStore.getUser(), e, chatStore.getLongType()); + ess.showError(chatStore.getUser().getBase(), e, chatStore.getLongType()); event.setCancelled(true); return false; } -- cgit v1.2.3