From 60a9de7e7cd2590a0beceed4c205277a1339b837 Mon Sep 17 00:00:00 2001
From: unknown <jerom.sar@hotmail.com>
Date: Mon, 5 May 2014 16:25:57 +0200
Subject: [PATCH] [Bleeding] Allow spaces in tags. Resolves #160

---
 buildnumber.properties                        |  4 +-
 .../TotalFreedomMod/Commands/Command_tag.java | 68 +++++++++++--------
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/buildnumber.properties b/buildnumber.properties
index 12c1a33d..fcbbdbbe 100644
--- a/buildnumber.properties
+++ b/buildnumber.properties
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Mon May 05 14:23:17 CEST 2014
-build.number=820
+#Mon May 05 16:25:12 CEST 2014
+build.number=821
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java
index b26a8dda..6ee10ee2 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java
@@ -6,13 +6,14 @@ import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Sets yourself a prefix", usage = "/<command> <<prefix> | off | clear <player> | clearall>")
+@CommandParameters(description = "Sets yourself a prefix", usage = "/<command> <set <tag..> | off | clear <player> | clearall>")
 public class Command_tag extends TFM_Command
 {
     public static final List<String> FORBIDDEN_WORDS = Arrays.asList(new String[]
@@ -23,6 +24,11 @@ public class Command_tag extends TFM_Command
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
+        if (args.length < 1)
+        {
+            return false;
+        }
+
         if (args.length == 1)
         {
             if ("clearall".equals(args[0]))
@@ -69,32 +75,10 @@ public class Command_tag extends TFM_Command
                 return true;
             }
 
-            if (!TFM_AdminList.isSuperAdmin(sender))
-            {
-                for (String word : FORBIDDEN_WORDS)
-                {
-                    if (args[0].toLowerCase().contains(word.toLowerCase()))
-                    {
-                        if (word.contains(String.valueOf(ChatColor.COLOR_CHAR)))
-                        {
-                            playerMsg("That tag contains a forbidden color-code.");
-                        }
-                        else
-                        {
-                            playerMsg("That tag contains a forbidden word.");
-                        }
-                        return true;
-                    }
-                }
-
-            }
-
-            TFM_PlayerData.getPlayerData(sender_p).setTag(args[0]);
-            playerMsg("Tag set.");
-
-            return true;
+            return false;
         }
-        else if (args.length == 2)
+
+        if (args.length == 2)
         {
             if ("clear".equals(args[0]))
             {
@@ -116,8 +100,38 @@ public class Command_tag extends TFM_Command
                 playerMsg("Removed " + player.getName() + "'s tag.");
                 return true;
             }
+        }
 
-            return false;
+        if ("set".equals(args[0]))
+        {
+            final String tag = StringUtils.join(args, " ", 1, args.length);
+
+            if (!TFM_AdminList.isSuperAdmin(sender))
+            {
+                for (String word : FORBIDDEN_WORDS)
+                {
+                    if (!tag.toLowerCase().contains(word))
+                    {
+                        continue;
+                    }
+
+                    if (word.contains(String.valueOf(ChatColor.COLOR_CHAR)))
+                    {
+                        playerMsg("That tag contains a forbidden color-code.");
+                    }
+                    else
+                    {
+                        playerMsg("That tag contains a forbidden word.");
+                    }
+                    return true;
+                }
+
+            }
+
+            TFM_PlayerData.getPlayerData(sender_p).setTag(TFM_Util.colorize(tag));
+            playerMsg("Tag set to " + TFM_Util.colorize(tag));
+
+            return true;
         }
 
         return false;