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

Ignore projectile *updates* when checking threshold. Also removed the damage cap as the real max. damage is much higher, at around 23k

Browse source
This commit is contained in:
MarioE 2014-05-22 01:22:58 -04:00
parent 7b79ae0d7e
commit 934ed6aee0
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
TShockAPI/GetDataHandlers.cs
View file

@ -2480,13 +2480,13 @@ namespace TShockAPI
if (!args.Player.Group.HasPermission(Permissions.ignoreprojectiledetection)) if (!args.Player.Group.HasPermission(Permissions.ignoreprojectiledetection))
{ {
if ((type == 90) && (TShock.Config.ProjIgnoreShrapnel))// ignore shrapnel if (type == 90 && TShock.Config.ProjIgnoreShrapnel) // Ignore crystal shards
{ {
Log.Debug("Ignoring shrapnel per config.."); Log.Debug("Ignoring shrapnel per config..");
} }
else else if (!Main.projectile[index].active)
{ {
args.Player.ProjectileThreshold++; args.Player.ProjectileThreshold++; // Creating new projectile
} }
} }
@ -3080,13 +3080,6 @@ namespace TShockAPI
var pvp = bits[0]; var pvp = bits[0];
var crit = bits[1]; var crit = bits[1];
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.
TShock.Utils.ForceKick(args.Player, "Crash Exploit Attempt", true);
Log.ConsoleError("Damage Exploit Attempt: Damage {0}", dmg);
return false;
}
if (OnPlayerDamage(id, direction, dmg, pvp, crit)) if (OnPlayerDamage(id, direction, dmg, pvp, crit))
return true; return true;

2
TerrariaServerAPI

@ -1 +1 @@
Subproject commit ff80ea2bb89c8f0319f52b3c8f21664c9e51ef8e Subproject commit 3d3979e51e31528bb5faaeaca6df08004687a028