From 30f4fdf6c6e7e52e38c52242607a47ae04f6959b Mon Sep 17 00:00:00 2001
From: drtshock <drtshock13@gmail.com>
Date: Sat, 2 Aug 2014 17:37:48 -0500
Subject: [PATCH] Properly replace chat. Hardcoding never helped anyone.

Fixes issue #30.
Use ternaries where possible.
---
 .../com/massivecraft/factions/FPlayer.java    | 25 ++++---------------
 .../listeners/FactionsChatListener.java       |  6 +----
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/massivecraft/factions/FPlayer.java b/src/main/java/com/massivecraft/factions/FPlayer.java
index 92510094..bff654bc 100644
--- a/src/main/java/com/massivecraft/factions/FPlayer.java
+++ b/src/main/java/com/massivecraft/factions/FPlayer.java
@@ -296,7 +296,7 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator {
     // Base:
 
     public String getTitle() {
-        return this.title;
+        return this.hasFaction() ? title : "";
     }
 
     public void setTitle(String title) {
@@ -312,10 +312,7 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator {
     }
 
     public String getTag() {
-        if (!this.hasFaction()) {
-            return "";
-        }
-        return this.getFaction().getTag();
+        return this.hasFaction() ? this.getFaction().getTag() : "";
     }
 
     // Base concatenations:
@@ -381,28 +378,16 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator {
     // These are injected into the format of global chat messages.
 
     public String getChatTag() {
-        if (!this.hasFaction()) {
-            return "";
-        }
-
-        return String.format(Conf.chatTagFormat, this.role.getPrefix() + this.getTag());
+        return this.hasFaction() ? String.format(Conf.chatTagFormat, this.role.getPrefix() + this.getTag()) : "";
     }
 
     // Colored Chat Tag
     public String getChatTag(Faction faction) {
-        if (!this.hasFaction()) {
-            return "";
-        }
-
-        return this.getRelationTo(faction).getColor() + getChatTag();
+        return this.hasFaction() ? this.getRelationTo(faction).getColor() + getChatTag() : "";
     }
 
     public String getChatTag(FPlayer fplayer) {
-        if (!this.hasFaction()) {
-            return "";
-        }
-
-        return this.getColorTo(fplayer) + getChatTag();
+        return this.hasFaction() ? this.getColorTo(fplayer) + getChatTag() : "";
     }
 
     // -------------------------------
diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java
index 440fcd77..e01d7e3e 100644
--- a/src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java
+++ b/src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java
@@ -98,12 +98,8 @@ public class FactionsChatListener implements Listener {
 
         if (!Conf.chatTagReplaceString.isEmpty() && eventFormat.contains(Conf.chatTagReplaceString)) {
             // we're using the "replace" method of inserting the faction tags
-            // if they stuck "[FACTION_TITLE]" in there, go ahead and do it too
-            if (eventFormat.contains("[FACTION_TITLE]")) {
-                eventFormat = eventFormat.replace("[FACTION_TITLE]", me.getTitle());
-            }
+            eventFormat = eventFormat.replace(Conf.chatTagReplaceString, 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)) {