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

Merge remote-tracking branch 'agaspace/general-devel' into general-devel

Browse source
This commit is contained in:
Lucas Nicodemus 2021-12-01 22:59:04 -08:00
commit ce056f1ce5
3 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -15,6 +15,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
## TShock 4.5.12
* Fixed the ability to spawn Zenith projectile with non-original items. (@AgaSpace)
* Added hook `GetDataHandlers.OnNpcTalk` for NpcTalk and a handler for it that stops unregistered and logged out players from interacting with NPCs, preventing them from smuggling or duplicating items via NPC item slots. (@tru321)
* Fixed the ability to create custom messages with your death (or the death of another player) (@AgaSpace)
## TShock 4.5.11
* Add the new allowed buff TentacleSpike to NPC buff cheat detection bouncer. (@sgkoishi)

21
TShockAPI/Bouncer.cs
View file

@ -2178,6 +2178,7 @@ namespace TShockAPI
bool pvp = args.PVP;
bool crit = args.Critical;
byte direction = args.Direction;
PlayerDeathReason reason = args.PlayerDeathReason;
if (id >= Main.maxPlayers || TShock.Players[id] == null)
{
@ -2242,6 +2243,20 @@ namespace TShockAPI
return;
}
/*
* PlayerDeathReason does not initially contain any information, so all fields have values -1 or null.
* We can use this to determine the real cause of death.
*
* If the player was not specified, that is, the player index is -1, then it is definitely a custom cause, as you can only deal damage with a projectile or another player.
* This is how everything else works. If an NPC is specified, its value is not -1, which is a custom cause.
*/
if (TShock.Config.Settings.DisableCustomDeathMessages &&
(reason._sourcePlayerIndex == -1 || reason._sourceNPCIndex != -1 || reason._sourceOtherIndex != -1 || reason._sourceCustomReason != null))
{
TShock.Log.ConsoleDebug("Bouncer / OnPlayerDamage rejected custom death message from {0}", args.Player.Name);
args.Handled = true;
return;
}
}
/// <summary>Bouncer's KillMe hook stops crash exploits from out of bounds values.</summary>
@ -2279,6 +2294,12 @@ namespace TShockAPI
args.Handled = true;
return;
}
if (TShock.Config.Settings.DisableCustomDeathMessages && playerDeathReason._sourceCustomReason != null)
{
TShock.Log.ConsoleDebug("Bouncer / OnKillMe rejected custom death message from {0}", args.Player.Name);
args.Handled = true;
return;
}
}
}

4
TShockAPI/Configuration/TShockConfig.cs
View file

@ -460,6 +460,10 @@ namespace TShockAPI.Configuration
/// <summary>Prohibit the use of Zenith projectile with different objects instead of weapons.</summary>
[Description("Prohibit the use of Zenith projectile with different objects instead of weapons.")]
public bool DisableModifiedZenith = false;
/// <summary>Allows you to disable or enable protection against creating custom messages with death. Created for developers who came up with a more original solution to this problem.</summary>
[Description("Allows you to disable or enable protection against creating custom messages with death. Created for developers who came up with a more original solution to this problem.")]
public bool DisableCustomDeathMessages = true;
#endregion