From 9a48ec04aac5b4069ea1434a548b78e5382f48dd Mon Sep 17 00:00:00 2001
From: unknown <jerom.sar@hotmail.com>
Date: Tue, 3 Dec 2013 14:18:38 +0100
Subject: [PATCH] Fixed developers not having the correct prefix batch format

---
 buildnumber.properties                         |  4 ++--
 .../TotalFreedomMod/Commands/Command_list.java |  2 +-
 .../Listener/TFM_PlayerListener.java           |  4 +++-
 .../TotalFreedomMod/TFM_PlayerRank.java        | 18 ++++++++++--------
 .../StevenLawson/TotalFreedomMod/TFM_Util.java |  2 +-
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/buildnumber.properties b/buildnumber.properties
index f0cc88c4..d96313ec 100644
--- a/buildnumber.properties
+++ b/buildnumber.properties
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Tue Dec 03 14:13:20 CET 2013
-build.number=665
+#Tue Dec 03 14:18:20 CET 2013
+build.number=666
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java
index 24083efc..503594b6 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java
@@ -61,7 +61,7 @@ public class Command_list extends TFM_Command
             {
                 continue;
             }
-            
+
             names.add(TFM_PlayerRank.fromSender(player).getPrefix() + player.getName());
         }
 
diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
index ecd57888..4e2132b9 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
@@ -717,7 +717,9 @@ public class TFM_PlayerListener implements Listener
 
                     player.setOp(true);
                 }
-            } else if (TFM_Util.DEVELOPERS.contains(player.getName())) {
+            }
+            else if (TFM_Util.DEVELOPERS.contains(player.getName()))
+            {
                 TFM_Util.bcastMsg(ChatColor.AQUA + player.getName() + " is " + TFM_Util.getRank(player));
             }
 
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerRank.java b/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerRank.java
index 27b00b11..190e649b 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerRank.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerRank.java
@@ -15,8 +15,6 @@ public enum TFM_PlayerRank
     SENIOR("a " + ChatColor.LIGHT_PURPLE + "Senior Admin", ChatColor.LIGHT_PURPLE + "[SrA]"),
     OWNER("the " + ChatColor.BLUE + "Owner", ChatColor.BLUE + "[Owner]"),
     CONSOLE("The " + ChatColor.DARK_PURPLE + "Console", ChatColor.DARK_PURPLE + "[Console]");
-    
-    
     private String loginMessage;
     private String prefix;
 
@@ -28,10 +26,11 @@ public enum TFM_PlayerRank
 
     public static TFM_PlayerRank fromSender(CommandSender sender)
     {
-        if (!(sender instanceof Player)) {
+        if (!(sender instanceof Player))
+        {
             return CONSOLE;
         }
-        
+
         if (TFM_SuperadminList.isSuperadminImpostor(sender))
         {
             return IMPOSTOR;
@@ -47,7 +46,7 @@ public enum TFM_PlayerRank
             {
                 return OWNER;
             }
-            
+
             if (entry.isSeniorAdmin())
             {
                 rank = SENIOR;
@@ -71,7 +70,6 @@ public enum TFM_PlayerRank
             {
                 if (DEVELOPERS.contains(sender.getName()))
                 {
-                    rank.setPrefix(ChatColor.DARK_PURPLE + "[Dev]");
                     rank.setLoginMessage("a " + ChatColor.DARK_PURPLE + "Developer");
                 }
             }
@@ -86,15 +84,19 @@ public enum TFM_PlayerRank
             {
                 rank = NON_OP;
             }
-            
+
             if (DEVELOPERS.contains(sender.getName()))
             {
-                rank.setPrefix(ChatColor.DARK_PURPLE + "[Dev]");
                 rank.setLoginMessage("a " + ChatColor.DARK_PURPLE + "Developer");
             }
 
         }
 
+        if (DEVELOPERS.contains(sender.getName()))
+        {
+            rank.setPrefix(ChatColor.DARK_PURPLE + "[Dev]");
+        }
+
         return rank;
     }
 
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
index 7d884adb..fe7147b4 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
@@ -418,7 +418,7 @@ public class TFM_Util
     @Deprecated
     public static String getRank(CommandSender sender)
     {
-       return TFM_PlayerRank.fromSender(sender).getLoginMessage();
+        return TFM_PlayerRank.fromSender(sender).getLoginMessage();
     }
 
     public static Date parseDateOffset(String time)