From fe93be66ad34b6f4da231c4479a3a88887fe862c Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Sat, 17 Aug 2013 13:53:46 +0200 Subject: [PATCH] Changed the color of party leader names in Party chat --- Changelog.txt | 1 + src/main/java/com/gmail/nossr50/chat/ChatManager.java | 4 +++- src/main/java/com/gmail/nossr50/chat/PartyChatManager.java | 5 +++++ src/main/java/com/gmail/nossr50/config/Config.java | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Changelog.txt b/Changelog.txt index 465eb3abf..64ba903ab 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -24,6 +24,7 @@ Version 1.4.07-dev = Fixed a bug where the Dodge DamageModifier wasn't being read from advanced.yml ! Changed the way Repair hands out XP, also added config options to control Repair XP ! Admin and Party chat prefixes are now customizable + ! Changed the color of party leader names in Party chat ! Improved profile saving ! Updated localization files ! Party item share category states are now saved when the server shuts down. diff --git a/src/main/java/com/gmail/nossr50/chat/ChatManager.java b/src/main/java/com/gmail/nossr50/chat/ChatManager.java index c566ddf3a..42407d152 100644 --- a/src/main/java/com/gmail/nossr50/chat/ChatManager.java +++ b/src/main/java/com/gmail/nossr50/chat/ChatManager.java @@ -11,6 +11,7 @@ public abstract class ChatManager { protected boolean useDisplayNames; protected String chatPrefix; + protected String senderName; protected String displayName; protected String message; @@ -27,7 +28,8 @@ public abstract class ChatManager { return; } - displayName = useDisplayNames ? event.getDisplayName() : event.getSender(); + senderName = event.getSender(); + displayName = useDisplayNames ? event.getDisplayName() : senderName; message = LocaleLoader.formatString(chatPrefix, displayName) + " " + event.getMessage(); sendMessage(); diff --git a/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java b/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java index c5777d5d5..94e2cdfb5 100644 --- a/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java +++ b/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java @@ -1,5 +1,6 @@ package com.gmail.nossr50.chat; +import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; @@ -25,6 +26,10 @@ public class PartyChatManager extends ChatManager { @Override protected void sendMessage() { + if (Config.getInstance().getPartyChatColorLeaderName() && senderName.equalsIgnoreCase(party.getLeader())) { + message = message.replaceAll(displayName, ChatColor.GOLD + displayName + ChatColor.RESET); + } + for (Player member : party.getOnlineMembers()) { member.sendMessage(message); } diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/src/main/java/com/gmail/nossr50/config/Config.java index 7b2f9fe53..8b5e1887a 100644 --- a/src/main/java/com/gmail/nossr50/config/Config.java +++ b/src/main/java/com/gmail/nossr50/config/Config.java @@ -226,7 +226,9 @@ public class Config extends AutoUpdateConfigLoader { public boolean getConfigOverwriteEnabled() { return config.getBoolean("General.Config_Update_Overwrite", true); } public String getPartyChatPrefix() { return config.getString("Commands.p.Chat_Prefix_Format", "[[GREEN]]([[WHITE]]{0}[[GREEN]])"); } + public boolean getPartyChatColorLeaderName() { return config.getBoolean("Commands.p.Gold_Leader_Name", true); } public boolean getPartyDisplayNames() { return config.getBoolean("Commands.p.Use_Display_Names", true); } + public String getAdminChatPrefix() { return config.getString("Commands.a.Chat_Prefix_Format", "[[AQUA]][[[WHITE]]{0}[[AQUA]]]"); } public boolean getAdminDisplayNames() { return config.getBoolean("Commands.a.Use_Display_Names", true); }