From 934ed6aee03cd858e2deba9e1dd38d6b84190308 Mon Sep 17 00:00:00 2001 From: MarioE Date: Thu, 22 May 2014 01:22:58 -0400 Subject: [PATCH] Ignore projectile *updates* when checking threshold. Also removed the damage cap as the real max. damage is much higher, at around 23k --- TShockAPI/GetDataHandlers.cs | 13 +++---------- TerrariaServerAPI | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index e92afb55..a32b2e0b 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -2480,13 +2480,13 @@ namespace TShockAPI 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.."); } - 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 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)) return true; diff --git a/TerrariaServerAPI b/TerrariaServerAPI index ff80ea2b..3d3979e5 160000 --- a/TerrariaServerAPI +++ b/TerrariaServerAPI @@ -1 +1 @@ -Subproject commit ff80ea2bb89c8f0319f52b3c8f21664c9e51ef8e +Subproject commit 3d3979e51e31528bb5faaeaca6df08004687a028