From 55c9067e344b883426ee860f5cad2334fc246357 Mon Sep 17 00:00:00 2001
From: Brettflan <dsr@fenrisoft.com>
Date: Sun, 28 Aug 2011 18:24:05 -0500
Subject: [PATCH] Factionless players now have nothing extra shown over their
 heads, instead of "Factionless" Also added AuthMe to softdepend list to have
 it load first

---
 .../massivecraft/factions/SpoutFeatures.java  | 19 ++++++++++++-------
 src/plugin.yml                                |  1 +
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/com/massivecraft/factions/SpoutFeatures.java b/src/com/massivecraft/factions/SpoutFeatures.java
index fabf29f3..725afedb 100644
--- a/src/com/massivecraft/factions/SpoutFeatures.java
+++ b/src/com/massivecraft/factions/SpoutFeatures.java
@@ -135,15 +135,20 @@ public class SpoutFeatures {
 		SpoutPlayer sPlayer = SpoutManager.getPlayer(viewer);
 
 		if (Conf.spoutFactionTagsOverNames || Conf.spoutFactionTitlesOverNames) {
-			String addTag = "";
-			if (Conf.spoutFactionTagsOverNames) {
-				addTag += !viewedFaction.isNormal() ? "Factionless" : viewedFaction.getTag(relation.getColor().toString() + "[") + "]";
+			if (viewedFaction.isNormal()) {
+				String addTag = "";
+				if (Conf.spoutFactionTagsOverNames) {
+					addTag += viewedFaction.getTag(relation.getColor().toString() + "[") + "]";
+				}
+				String rolePrefix = viewedRole.getPrefix();
+				if (Conf.spoutFactionTitlesOverNames && (!viewedTitle.isEmpty() || !rolePrefix.isEmpty())) {
+					addTag += (addTag.isEmpty() ? "" : " ") + viewedRole.getPrefix() + viewedTitle;
+				}
+				spoutApp.setPlayerTitle(sPlayer, viewed, addTag + "\n" + viewed.getDisplayName());
 			}
-			String rolePrefix = viewedRole.getPrefix();
-			if (Conf.spoutFactionTitlesOverNames && (!viewedTitle.isEmpty() || !rolePrefix.isEmpty())) {
-				addTag += (addTag.isEmpty() ? "" : " ") + viewedRole.getPrefix() + viewedTitle;
+			else {
+				spoutApp.resetPlayerTitle(sPlayer, viewed);
 			}
-			spoutApp.setPlayerTitle(sPlayer, viewed, addTag + "\n" + viewed.getDisplayName());
 		}
 
 		if (
diff --git a/src/plugin.yml b/src/plugin.yml
index 3607ab2e..3116ae99 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -9,6 +9,7 @@ softdepend:
   - iChat
   - LocalAreaChat
   - nChat
+  - AuthMe
   - iConomy
   - Spout
 commands: