From a59e6added6cef76357d702728548e3e520dddd6 Mon Sep 17 00:00:00 2001
From: StevenLawson <steven@smlawson.com>
Date: Mon, 12 Aug 2013 14:19:17 -0400
Subject: [PATCH] Tweaks to Command_tag

---
 .../TotalFreedomMod/Commands/Command_tag.java | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java
index 18252db7..806f6bc6 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java
@@ -6,6 +6,7 @@ import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -18,10 +19,9 @@ public class Command_tag extends TFM_Command
     {
         "admin", "owner", "moderator", "developer"
     });
-    
     public static final List<String> FORBIDDEN_CODE = Arrays.asList(new String[]
     {
-        "&k"
+        "&k", (ChatColor.COLOR_CHAR + "k")
     });
 
     @Override
@@ -29,7 +29,6 @@ public class Command_tag extends TFM_Command
     {
         if (args.length == 1)
         {
-
             if ("clearall".equals(args[0]))
             {
                 if (!TFM_SuperadminList.isUserSuperadmin(sender))
@@ -56,14 +55,14 @@ public class Command_tag extends TFM_Command
 
             if (senderIsConsole)
             {
-                playerMsg("This can only be used by players.");
+                playerMsg("Only in-game players can set tags. Use \"/tag clearall\" to reset all tags.");
                 return true;
             }
 
             if (TFM_Util.isStopCommand(args[0]))
             {
                 TFM_PlayerData.getPlayerData(sender_p).setTag(null);
-                playerMsg("Removed your tag.");
+                playerMsg("Your tag has been removed.");
                 return true;
             }
 
@@ -77,27 +76,23 @@ public class Command_tag extends TFM_Command
             {
                 for (String word : FORBIDDEN_WORDS)
                 {
-                    if (args[0].toLowerCase().contains(word))
+                    if (args[0].toLowerCase().contains(word.toLowerCase()))
                     {
                         playerMsg("That tag contains a forbidden word.");
                         return true;
                     }
                 }
-            }
-            
-            if (!TFM_SuperadminList.isUserSuperadmin(sender))
-            {
+
                 for (String word : FORBIDDEN_CODE)
                 {
-                    if (args[0].toLowerCase().contains(word))
+                    if (args[0].toLowerCase().contains(word.toLowerCase()))
                     {
-                        playerMsg("You may not include the colour code you have attempted to use in your tag")
-                    	return true;
+                        playerMsg("That tag contains a forbidden color code.");
+                        return true;
                     }
                 }
             }
 
-
             TFM_PlayerData.getPlayerData(sender_p).setTag(args[0]);
             playerMsg("Tag set.");