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

Merge pull request #759 from PhoenixICE/general-devel

Browse source 
Added BIGINT and expanded log errors
This commit is contained in:
MarioE 2014-02-27 20:41:17 -05:00
commit 2ec11f0dbb
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/DB/IQueryBuilder.cs
View file

@ -67,6 +67,7 @@ namespace TShockAPI.DB
{ MySqlDbType.Double, "REAL" }, { MySqlDbType.Double, "REAL" },
{ MySqlDbType.Int32, "INTEGER" }, { MySqlDbType.Int32, "INTEGER" },
{ MySqlDbType.Blob, "BLOB" }, { MySqlDbType.Blob, "BLOB" },
{ MySqlDbType.Int64, "BIGINT"},
}; };
public string DbTypeToString(MySqlDbType type, int? length) public string DbTypeToString(MySqlDbType type, int? length)
@ -115,6 +116,7 @@ namespace TShockAPI.DB
{ MySqlDbType.Float, "FLOAT" }, { MySqlDbType.Float, "FLOAT" },
{ MySqlDbType.Double, "DOUBLE" }, { MySqlDbType.Double, "DOUBLE" },
{ MySqlDbType.Int32, "INT" }, { MySqlDbType.Int32, "INT" },
{ MySqlDbType.Int64, "BIGINT"},
}; };
public string DbTypeToString(MySqlDbType type, int? length) public string DbTypeToString(MySqlDbType type, int? length)

3
TShockAPI/GetDataHandlers.cs
View file

@ -1334,6 +1334,7 @@ namespace TShockAPI
if (cur < 0 || cur > 500 || max < 100 || max > 500) //Abnormal values have the potential to cause infinite loops in the server. if (cur < 0 || cur > 500 || max < 100 || max > 500) //Abnormal values have the potential to cause infinite loops in the server.
{ {
TShock.Utils.ForceKick(args.Player, "Crash Exploit Attempt", true); TShock.Utils.ForceKick(args.Player, "Crash Exploit Attempt", true);
Log.ConsoleError("HP Exploit Attempt: Current HP {0}, Max HP {0}", cur, max);
return true; return true;
} }
@ -2523,6 +2524,7 @@ namespace TShockAPI
if (dmg > 20000) //Abnormal values have the potential to cause infinite loops in the server. if (dmg > 20000) //Abnormal values have the potential to cause infinite loops in the server.
{ {
TShock.Utils.ForceKick(args.Player, "Crash Exploit Attempt", true); TShock.Utils.ForceKick(args.Player, "Crash Exploit Attempt", true);
Log.ConsoleError("Death Exploit Attempt: Damage {0}", dmg);
return false; return false;
} }
@ -3023,6 +3025,7 @@ namespace TShockAPI
if (dmg > 12000) //Abnormal values have the potential to cause infinite loops in the server. if (dmg > 12000) //Abnormal values have the potential to cause infinite loops in the server.
{ //12000 because Skely Prime Head does 10339 or some bs during the day. { //12000 because Skely Prime Head does 10339 or some bs during the day.
TShock.Utils.ForceKick(args.Player, "Crash Exploit Attempt", true); TShock.Utils.ForceKick(args.Player, "Crash Exploit Attempt", true);
Log.ConsoleError("Damage Exploit Attempt: Damage {0}", dmg);
return false; return false;
} }