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

Merge branch 'general-devel' into fix-voidbag-sprayer

Browse source
This commit is contained in:
Chris 2026-01-18 16:02:23 +10:30 • committed by GitHub
commit c17a2a64b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 139 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
TShockAPI/GetDataHandlers.cs
View file

@ -4330,6 +4330,15 @@ namespace TShockAPI
args.Player.Dead = true;
args.Player.RespawnTimer = TShock.Config.Settings.RespawnSeconds;
if (Main.ServerSideCharacter && !args.Player.HasPermission(Permissions.bypassssc))
{
if (pvp)
{
args.Player.sscDeathsPVP++;
}
args.Player.sscDeathsPVE++;
}
foreach (NPC npc in Main.npc)
{
if (npc.active && (npc.boss || npc.type == 13 || npc.type == 14 || npc.type == 15) &&