From c735053bc3f0cdfacc21b1b2241ccc5b1a4f9b01 Mon Sep 17 00:00:00 2001
From: drtshock <drtshock13@gmail.com>
Date: Sat, 2 Aug 2014 18:19:56 -0500
Subject: [PATCH] Refix chat handling.

---
 .../factions/listeners/FactionsChatListener.java             | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java
index e01d7e3e..6e11ffe1 100644
--- a/src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java
+++ b/src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java
@@ -98,8 +98,11 @@ public class FactionsChatListener implements Listener {
 
         if (!Conf.chatTagReplaceString.isEmpty() && eventFormat.contains(Conf.chatTagReplaceString)) {
             // we're using the "replace" method of inserting the faction tags
-            eventFormat = eventFormat.replace(Conf.chatTagReplaceString, me.getTitle());
+            if (eventFormat.contains("[FACTION_TITLE]")) {
+                eventFormat = eventFormat.replace("[FACTION_TITLE]", me.getTitle());
+            }
             InsertIndex = eventFormat.indexOf(Conf.chatTagReplaceString);
+            eventFormat = eventFormat.replace(Conf.chatTagReplaceString, "");
             Conf.chatTagPadAfter = false;
             Conf.chatTagPadBefore = false;
         } else if (!Conf.chatTagInsertAfterString.isEmpty() && eventFormat.contains(Conf.chatTagInsertAfterString)) {