themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Remove valid string checks, Terraria seems to check and replace invalid chars by default

Browse source
This commit is contained in:
Deathmax 2012-01-18 20:55:30 +08:00
parent 27f61645ce
commit e879135d21
3 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
TShockAPI/GetDataHandlers.cs
View file

@ -816,16 +816,11 @@ namespace TShockAPI
return true; return true;
} }
if (!TShock.Utils.ValidString(name)) /*if (!TShock.Utils.ValidString(name))
{ {
TShock.Utils.ForceKick(args.Player, "Unprintable character in name"); TShock.Utils.ForceKick(args.Player, "Unprintable character in name");
return true; return true;
} }*/
if (name.Length > 32)
{
TShock.Utils.ForceKick(args.Player, "Name exceeded 32 characters.");
return true;
}
if (name.Trim().Length == 0) if (name.Trim().Length == 0)
{ {
TShock.Utils.ForceKick(args.Player, "Empty Name."); TShock.Utils.ForceKick(args.Player, "Empty Name.");
@ -1634,10 +1629,10 @@ namespace TShockAPI
if (textlength > 0) if (textlength > 0)
{ {
deathtext = Encoding.ASCII.GetString(args.Data.ReadBytes(textlength)); deathtext = Encoding.ASCII.GetString(args.Data.ReadBytes(textlength));
if (!TShock.Utils.ValidString(deathtext)) /*if (!TShock.Utils.ValidString(deathtext))
{ {
return true; return true;
} }*/
} }
args.Player.LastDeath = DateTime.Now; args.Player.LastDeath = DateTime.Now;
@ -2021,10 +2016,10 @@ namespace TShockAPI
if (textlength > 0) if (textlength > 0)
{ {
deathtext = Encoding.ASCII.GetString(args.Data.ReadBytes(textlength)); deathtext = Encoding.ASCII.GetString(args.Data.ReadBytes(textlength));
if (!TShock.Utils.ValidString(deathtext)) /*if (!TShock.Utils.ValidString(deathtext))
{ {
return true; return true;
} }*/
} }
if (TShock.Players[id] == null) if (TShock.Players[id] == null)

4
TShockAPI/TShock.cs
View file

@ -680,11 +680,11 @@ namespace TShockAPI
return; return;
} }
if (!Utils.ValidString(text)) /*if (!Utils.ValidString(text))
{ {
e.Handled = true; e.Handled = true;
return; return;
} }*/
if (text.StartsWith("/")) if (text.StartsWith("/"))
{ {

2
TShockAPI/Utils.cs
View file

@ -488,7 +488,7 @@ namespace TShockAPI
{ {
foo = foo.Replace("%map%", Main.worldName); foo = foo.Replace("%map%", Main.worldName);
foo = foo.Replace("%players%", GetPlayers()); 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. if (foo.Substring(0, 1) == "%" && foo.Substring(12, 1) == "%") //Look for a beginning color code.
{ {
string possibleColor = foo.Substring(0, 13); string possibleColor = foo.Substring(0, 13);