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

Merge pull request #1310 from Simon311/general-devel

Browse source 
Fix for HealOtherPlayer exploit, also fix #1309
This commit is contained in:
Lucas Nicodemus 2016-10-17 08:51:19 -06:00 • committed by GitHub
commit dce26d6928
4 changed files with 53 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
TShockAPI/TShock.cs
View file

@ -1030,6 +1030,15 @@ namespace TShockAPI
player.PaintThreshold = 0;
}
if (player.HealOtherThreshold >= TShock.Config.HealOtherThreshold)
{
player.Disable("Reached HealOtherPlayer threshold", flags);
}
if (player.HealOtherThreshold > 0)
{
player.HealOtherThreshold = 0;
}
if (player.RespawnTimer > 0 && --player.RespawnTimer == 0 && player.Difficulty != 2)
{
player.Spawn();
@ -1458,7 +1467,7 @@ namespace TShockAPI
/// <param name="args">The CommandEventArgs object</param>
private void ServerHooks_OnCommand(CommandEventArgs args)
{
if (args.Handled)
if (args.Handled || string.IsNullOrWhiteSpace(args.Command))
return;
// Damn you ThreadStatic and Redigit