From c38133ad57a3156bad713cc7d893a343afabaab9 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Mon, 5 Feb 2024 13:32:40 -0500 Subject: [PATCH] Core/Unit: Restore function of HandleKillPlayer Port From (https://github.com/TrinityCore/TrinityCore/commit/78012dadf2bb04398cbe3630d07762bffff82c8b) --- Source/Game/Entities/Unit/Unit.Combat.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Game/Entities/Unit/Unit.Combat.cs b/Source/Game/Entities/Unit/Unit.Combat.cs index 13299b363..a30ccf2a3 100644 --- a/Source/Game/Entities/Unit/Unit.Combat.cs +++ b/Source/Game/Entities/Unit/Unit.Combat.cs @@ -1009,7 +1009,10 @@ namespace Game.Entities { Player playerVictim = victim.ToPlayer(); if (playerVictim != null) - bg.HandleKillPlayer(playerVictim, player); + { + if (player != null) + bg.HandleKillPlayer(playerVictim, player); + } else bg.HandleKillUnit(victim.ToCreature(), player); }