From e879135d2117f5d8daa860fddfde6f7952e9edcc Mon Sep 17 00:00:00 2001
From: Deathmax <death@deathmax.tk>
Date: Wed, 18 Jan 2012 20:55:30 +0800
Subject: [PATCH] Remove valid string checks, Terraria seems to check and
 replace invalid chars by default

---
 TShockAPI/GetDataHandlers.cs | 17 ++++++-----------
 TShockAPI/TShock.cs          |  4 ++--
 TShockAPI/Utils.cs           |  2 +-
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index e8d3de8c..9733e604 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -816,16 +816,11 @@ namespace TShockAPI
 				return true;
 			}
 
-			if (!TShock.Utils.ValidString(name))
+			/*if (!TShock.Utils.ValidString(name))
 			{
 				TShock.Utils.ForceKick(args.Player, "Unprintable character in name");
 				return true;
-			}
-			if (name.Length > 32)
-			{
-				TShock.Utils.ForceKick(args.Player, "Name exceeded 32 characters.");
-				return true;
-			}
+			}*/
 			if (name.Trim().Length == 0)
 			{
 				TShock.Utils.ForceKick(args.Player, "Empty Name.");
@@ -1634,10 +1629,10 @@ namespace TShockAPI
 			if (textlength > 0)
 			{
 				deathtext = Encoding.ASCII.GetString(args.Data.ReadBytes(textlength));
-				if (!TShock.Utils.ValidString(deathtext))
+				/*if (!TShock.Utils.ValidString(deathtext))
 				{
 					return true;
-				}
+				}*/
 			}
 
 			args.Player.LastDeath = DateTime.Now;
@@ -2021,10 +2016,10 @@ namespace TShockAPI
 			if (textlength > 0)
 			{
 				deathtext = Encoding.ASCII.GetString(args.Data.ReadBytes(textlength));
-				if (!TShock.Utils.ValidString(deathtext))
+				/*if (!TShock.Utils.ValidString(deathtext))
 				{
 					return true;
-				}
+				}*/
 			}
 
 			if (TShock.Players[id] == null)
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index cc0ffe5a..4f782588 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -680,11 +680,11 @@ namespace TShockAPI
 				return;
 			}
 
-			if (!Utils.ValidString(text))
+			/*if (!Utils.ValidString(text))
 			{
 				e.Handled = true;
 				return;
-			}
+			}*/
 
 			if (text.StartsWith("/"))
 			{
diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs
index b9e3eedc..c93ebb11 100644
--- a/TShockAPI/Utils.cs
+++ b/TShockAPI/Utils.cs
@@ -488,7 +488,7 @@ namespace TShockAPI
 				{
 					foo = foo.Replace("%map%", Main.worldName);
 					foo = foo.Replace("%players%", GetPlayers());
-					foo = SanitizeString(foo);
+					//foo = SanitizeString(foo);
 					if (foo.Substring(0, 1) == "%" && foo.Substring(12, 1) == "%") //Look for a beginning color code.
 					{
 						string possibleColor = foo.Substring(0, 13);