From 97b27cd7b4d2e51dcf86acc37bbaedde868b7e54 Mon Sep 17 00:00:00 2001
From: StevenLawson <steven@smlawson.com>
Date: Sat, 21 Sep 2013 13:58:16 -0400
Subject: [PATCH] Change tag character limit. Now max = 20 characters, not
 including color codes. TFM_Util.colorise() -> TFM_Util.colorize()

---
 appinfo.properties                                          | 6 +++---
 buildnumber.properties                                      | 4 ++--
 .../TotalFreedomMod/Commands/Command_rawsay.java            | 2 +-
 .../TotalFreedomMod/Commands/Command_saconfig.java          | 2 +-
 .../StevenLawson/TotalFreedomMod/Commands/Command_tag.java  | 4 ++--
 src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java | 2 +-
 src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java     | 2 +-
 src/me/StevenLawson/TotalFreedomMod/TFM_Util.java           | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/appinfo.properties b/appinfo.properties
index f11f4802..42a4d5c3 100644
--- a/appinfo.properties
+++ b/appinfo.properties
@@ -1,5 +1,5 @@
-#Thu, 19 Sep 2013 21:24:16 -0400
+#Sat, 21 Sep 2013 13:56:10 -0400
 
 program.VERSION=3.2
-program.BUILDNUM=599
-program.BUILDDATE=09/19/2013 09\:24 PM
+program.BUILDNUM=600
+program.BUILDDATE=09/21/2013 01\:56 PM
diff --git a/buildnumber.properties b/buildnumber.properties
index efbd44cb..2080d35c 100644
--- a/buildnumber.properties
+++ b/buildnumber.properties
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Thu Sep 19 21:24:16 EDT 2013
-build.number=600
+#Sat Sep 21 13:56:10 EDT 2013
+build.number=601
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rawsay.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rawsay.java
index 5b20465c..d36a1ee7 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rawsay.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rawsay.java
@@ -15,7 +15,7 @@ public class Command_rawsay extends TFM_Command
     {
         if (args.length > 0)
         {
-            TFM_Util.bcastMsg(TFM_Util.colorise(StringUtils.join(args, " ")));
+            TFM_Util.bcastMsg(TFM_Util.colorize(StringUtils.join(args, " ")));
         }
 
         return true;
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java
index 2be3ddce..540335da 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java
@@ -78,7 +78,7 @@ public class Command_saconfig extends TFM_Command
                 }
                 else
                 {
-                    playerMsg(ChatColor.stripColor(TFM_Util.colorise(superadmin.toString())));
+                    playerMsg(ChatColor.stripColor(TFM_Util.colorize(superadmin.toString())));
                 }
 
                 return true;
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java
index b1720772..87b7c636 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java
@@ -63,9 +63,9 @@ public class Command_tag extends TFM_Command
                 return true;
             }
 
-            if (args[0].length() > 15)
+            if (ChatColor.stripColor(TFM_Util.colorize(args[0])).length() > 20)
             {
-                playerMsg("That tag is too long.");
+                playerMsg("That tag is too long [Max = 20 characters, not including color codes].");
                 return true;
             }
 
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java b/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java
index 00d516ae..f8a4511e 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java
@@ -311,7 +311,7 @@ public class TFM_CommandBlocker
                 }
                 else
                 {
-                    response = ChatColor.GRAY + TFM_Util.colorise(this.message);
+                    response = ChatColor.GRAY + TFM_Util.colorize(this.message);
                 }
 
                 sender.sendMessage(response);
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java b/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java
index 35945574..d876887e 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java
@@ -489,7 +489,7 @@ public class TFM_PlayerData
         }
         else
         {
-            this.tag = TFM_Util.colorise(tag) + ChatColor.WHITE;
+            this.tag = TFM_Util.colorize(tag) + ChatColor.WHITE;
         }
     }
 
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
index a902c62b..769b31c7 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
@@ -993,7 +993,7 @@ public class TFM_Util
         return COLOR_POOL.get(RANDOM.nextInt(COLOR_POOL.size()));
     }
 
-    public static String colorise(String string)
+    public static String colorize(String string)
     {
         return ChatColor.translateAlternateColorCodes('&', string);
     }