diff options
| author | Iaccidentally <coryhuckaby@gmail.com> | 2013-07-13 10:38:28 -0400 |
|---|---|---|
| committer | Iaccidentally <coryhuckaby@gmail.com> | 2013-07-13 10:38:28 -0400 |
| commit | 3d0f0062a9e5c0c66e08add1de9ff0437e3962d6 (patch) | |
| tree | ccb066c15927d6236ad83de42a71871eae9fa044 /EssentialsChat | |
| parent | 6af622b6b1a4d21d4d30892afdc58ffcb8d88247 (diff) | |
| parent | ab359f678a432bafd6a5f6048c4880b225c49c0e (diff) | |
| download | Essentials-3d0f0062a9e5c0c66e08add1de9ff0437e3962d6.tar Essentials-3d0f0062a9e5c0c66e08add1de9ff0437e3962d6.tar.gz Essentials-3d0f0062a9e5c0c66e08add1de9ff0437e3962d6.tar.lz Essentials-3d0f0062a9e5c0c66e08add1de9ff0437e3962d6.tar.xz Essentials-3d0f0062a9e5c0c66e08add1de9ff0437e3962d6.zip | |
Merge branch '2.x' of https://github.com/essentials/Essentials into API
Diffstat (limited to 'EssentialsChat')
| -rw-r--r-- | EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java | 2 | ||||
| -rw-r--r-- | EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java | 7 |
2 files changed, 8 insertions, 1 deletions
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; } diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java index efd3f5515..7eaaf2e0f 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.getBase()); + 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); |