From f4d56d4796233a0ce0f1013e109f620d3ee33013 Mon Sep 17 00:00:00 2001 From: Harry Jeffery Date: Sat, 24 Sep 2011 20:30:15 +0100 Subject: [PATCH] Alliance chat is now white, with ally-colour names. --- src/com/massivecraft/factions/Conf.java | 2 +- .../factions/listeners/FactionsChatEarlyListener.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/massivecraft/factions/Conf.java b/src/com/massivecraft/factions/Conf.java index 0b4ba0e5..d42626b3 100644 --- a/src/com/massivecraft/factions/Conf.java +++ b/src/com/massivecraft/factions/Conf.java @@ -65,7 +65,7 @@ public class Conf { public static boolean chatTagPadAfter = true; public static String chatTagFormat = "%s"+ChatColor.WHITE; public static String factionChatFormat = "%s"+ChatColor.WHITE+" %s"; - public static String allianceChatFormat = "%s"+colorAlly+" %s"; + public static String allianceChatFormat = "%s"+ChatColor.WHITE+" %s"; public static boolean allowNoSlashCommand = true; diff --git a/src/com/massivecraft/factions/listeners/FactionsChatEarlyListener.java b/src/com/massivecraft/factions/listeners/FactionsChatEarlyListener.java index 778bf31d..a167c4db 100644 --- a/src/com/massivecraft/factions/listeners/FactionsChatEarlyListener.java +++ b/src/com/massivecraft/factions/listeners/FactionsChatEarlyListener.java @@ -57,8 +57,8 @@ public class FactionsChatEarlyListener extends PlayerListener{ return; } else if (me.getChatMode() == ChatMode.ALLIANCE ) { - String message = String.format(Conf.allianceChatFormat, me.getNameAndRelevant(me), msg); Faction myFaction = me.getFaction(); + String message = String.format(Conf.allianceChatFormat, Conf.colorAlly+"["+myFaction.getTag()+"] "+me.getName(), msg); //Send message to our own faction myFaction.sendMessage(message);