From c482349f47e00ec366bc95fc237a76d355fd3b9e Mon Sep 17 00:00:00 2001
From: Steven Lawson <steven@smlawson.com>
Date: Fri, 26 Jul 2013 19:48:18 -0400
Subject: [PATCH] TFM_CommandBlockerNew cleanup.

---
 .../TFM_CommandBlockerNew.java                | 72 +++++++++----------
 1 file changed, 35 insertions(+), 37 deletions(-)

diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlockerNew.java b/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlockerNew.java
index 12c177eb..0b0e16df 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlockerNew.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlockerNew.java
@@ -142,7 +142,7 @@ public class TFM_CommandBlockerNew
             {
                 if (doAction)
                 {
-                    doBlockedCommandAction(sender, blockedCommandEntry);
+                    blockedCommandEntry.doActions(sender);
                 }
 
                 return true;
@@ -152,36 +152,6 @@ public class TFM_CommandBlockerNew
         return false;
     }
 
-    private void doBlockedCommandAction(CommandSender sender, TFM_CommandBlocker_BlockedCommandEntry blockedCommandEntry)
-    {
-        CommandBlockerAction action = blockedCommandEntry.getAction();
-
-        if (action == CommandBlockerAction.BLOCK_AND_EJECT && sender instanceof Player)
-        {
-            TFM_Util.autoEject((Player) sender, "You used a prohibited command: " + blockedCommandEntry.getCommand());
-            TFM_Util.bcastMsg(sender.getName() + " was automatically kicked for using harmful commands.", ChatColor.RED);
-        }
-        else
-        {
-            String message = blockedCommandEntry.getMessage();
-
-            if (action == CommandBlockerAction.BLOCK_UNKNOWN)
-            {
-                message = "Unknown command. Type \"help\" for help.";
-            }
-            else if (message == null || "_".equals(message))
-            {
-                message = ChatColor.GRAY + "That command is blocked.";
-            }
-            else
-            {
-                message = ChatColor.GRAY + ChatColor.translateAlternateColorCodes('&', message);
-            }
-
-            sender.sendMessage(message);
-        }
-    }
-
     private static enum CommandBlockerRank
     {
         ANYONE("a", 0),
@@ -201,7 +171,7 @@ public class TFM_CommandBlockerNew
 
         public String getToken()
         {
-            return token;
+            return this.token;
         }
 
         public boolean hasPermission(CommandSender sender)
@@ -261,7 +231,7 @@ public class TFM_CommandBlockerNew
 
         public String getToken()
         {
-            return token;
+            return this.token;
         }
 
         public static CommandBlockerAction fromToken(String token)
@@ -294,28 +264,56 @@ public class TFM_CommandBlockerNew
 
         public CommandBlockerAction getAction()
         {
-            return action;
+            return this.action;
         }
 
         public String getCommand()
         {
-            return command;
+            return this.command;
         }
 
         public String getMessage()
         {
-            return message;
+            return this.message;
         }
 
         public CommandBlockerRank getRank()
         {
-            return rank;
+            return this.rank;
         }
 
         public void setCommand(String command)
         {
             this.command = command;
         }
+
+        private void doActions(CommandSender sender)
+        {
+            if (this.action == CommandBlockerAction.BLOCK_AND_EJECT && sender instanceof Player)
+            {
+                TFM_Util.autoEject((Player) sender, "You used a prohibited command: " + this.command);
+                TFM_Util.bcastMsg(sender.getName() + " was automatically kicked for using harmful commands.", ChatColor.RED);
+            }
+            else
+            {
+                String response;
+
+                if (this.action == CommandBlockerAction.BLOCK_UNKNOWN)
+                {
+                    response = "Unknown command. Type \"help\" for help.";
+                }
+                else if (this.message == null || "_".equals(this.message))
+                {
+                    response = ChatColor.GRAY + "That command is blocked.";
+                }
+                else
+                {
+                    response = ChatColor.GRAY + ChatColor.translateAlternateColorCodes('&', this.message);
+                }
+
+                sender.sendMessage(response);
+            }
+        }
     }
 
     public static TFM_CommandBlockerNew getInstance()