From 63b80d0d6900d7e8fc51ac00334f8e2ea57f584e Mon Sep 17 00:00:00 2001
From: Steven Lawson <steven@smlawson.com>
Date: Sun, 2 Dec 2012 12:27:10 -0500
Subject: [PATCH] Changes to AdminChat.

---
 .../TotalFreedomMod/Commands/Command_o.java   | 23 ++++++++-----------
 .../Listener/TFM_PlayerListener.java          | 13 +++++------
 .../TotalFreedomMod/TFM_Util.java             | 15 ++++++------
 src/plugin.yml                                |  3 ++-
 4 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_o.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_o.java
index 7eeb0d08..f172a217 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_o.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_o.java
@@ -1,10 +1,8 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
 import me.StevenLawson.TotalFreedomMod.TFM_UserInfo;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.apache.commons.lang.StringUtils;
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -15,24 +13,23 @@ public class Command_o extends TFM_Command
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        if(senderIsConsole && args.length == 0)
+        if (args.length == 0)
         {
-            TFM_Util.playerMsg(sender, "Only in-game players can toggle AdminChat.");
-            return true;
-        }
+            if (senderIsConsole)
+            {
+                TFM_Util.playerMsg(sender, "Only in-game players can toggle AdminChat.");
+                return true;
+            }
 
-        if(args.length == 0)
-        {
             TFM_UserInfo userinfo = TFM_UserInfo.getPlayerData(sender_p);
             userinfo.setAdminChat(!userinfo.inAdminChat());
-            TFM_Util.playerMsg(sender, "Toggled Admin Chat " + (userinfo.inAdminChat() ? "on" : "off")+".");
+            TFM_Util.playerMsg(sender, "Toggled Admin Chat " + (userinfo.inAdminChat() ? "on" : "off") + ".");
         }
         else
         {
-
-            // very complicated magic stuff
-            TFM_Util.AdminChatMessage(sender, StringUtils.join(args, " "), senderIsConsole);
+            TFM_Util.adminChatMessage(sender, StringUtils.join(args, " "), senderIsConsole);
         }
+
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
index 8266aa5a..068b1225 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
@@ -359,16 +359,15 @@ public class TFM_PlayerListener implements Listener
             }
 
             // check for adminchat
-            if(playerdata.inAdminChat())
+            if (playerdata.inAdminChat())
             {
-                TFM_Util.AdminChatMessage(p, message, false);
+                TFM_Util.adminChatMessage(p, message, false);
                 event.setCancelled(true);
+                return;
             }
-            else
-            {
-                // finally, set message
-                event.setMessage(message);
-            }
+
+            // finally, set message
+            event.setMessage(message);
         }
         catch (Exception ex)
         {
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
index 133fe774..8c0b253a 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
@@ -998,17 +998,16 @@ public class TFM_Util
         fos.getChannel().transferFrom(rbc, 0, 1 << 24);
         fos.close();
     }
-    public static void AdminChatMessage(CommandSender sender, String message, boolean senderIsConsole)
+
+    public static void adminChatMessage(CommandSender sender, String message, boolean senderIsConsole)
     {
-        // complicated magic
-        String name = sender.getName()+
-                    (senderIsConsole ? ChatColor.DARK_PURPLE+" (Console)" :
-                    (TFM_SuperadminList.isSeniorAdmin(sender) ? ChatColor.LIGHT_PURPLE+ " (SrA)" : ChatColor.GOLD+" (SA)"));
-        
+        String name = sender.getName() + (senderIsConsole ? ChatColor.DARK_PURPLE + " (Console)" : (TFM_SuperadminList.isSeniorAdmin(sender) ? ChatColor.LIGHT_PURPLE + " (SrA)" : ChatColor.GOLD + " (SA)"));
+
         TFM_Log.info("[ADMIN] " + name + ": " + message);
-        for(Player p : Bukkit.getOnlinePlayers())
+
+        for (Player p : Bukkit.getOnlinePlayers())
         {
-            if(TFM_SuperadminList.isUserSuperadmin(p))
+            if (TFM_SuperadminList.isUserSuperadmin(p))
             {
                 p.sendMessage("[" + ChatColor.AQUA + "ADMIN" + ChatColor.WHITE + "] " + ChatColor.DARK_RED + name + ChatColor.WHITE + ": " + ChatColor.AQUA + message);
             }
diff --git a/src/plugin.yml b/src/plugin.yml
index a768b4ce..bb7b4322 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -120,8 +120,9 @@ commands:
     description: Superadmin command - Attempt to detect "invisible griefers" and "nukers".
     usage: /<command> <on | off> [range] [blockrate]
   o:
-    description: Superadmin command - Talk privately with other admins
+    description: Superadmin command - AdminChat - Talk privately with other admins. Using <command> itself will toggle AdminChat on and off for all messages.
     usage: /<command> [message]
+    aliases: [adminchat]
   onlinemode:
     description: Console command - Switch server online-mode on and off.
     usage: /<command> <on | off>