From 47cfd6d41924c7c40416460f28f997539a6d107f Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 5 Jan 2022 20:25:41 -0500 Subject: [PATCH] Core/Creatures: Fixed crash when guards get killed by periodic auras whose caster is offline or despawned Port From (https://github.com/TrinityCore/TrinityCore/commit/e539de68e10a64b0f0a0619eb5213ab5315b01c9) --- Source/Game/AI/CoreAI/GuardAI.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Source/Game/AI/CoreAI/GuardAI.cs b/Source/Game/AI/CoreAI/GuardAI.cs index 1d5a0c6d9..31c9a70f8 100644 --- a/Source/Game/AI/CoreAI/GuardAI.cs +++ b/Source/Game/AI/CoreAI/GuardAI.cs @@ -63,9 +63,12 @@ namespace Game.AI public override void JustDied(Unit killer) { - Player player = killer.GetCharmerOrOwnerPlayerOrPlayerItself(); - if (player != null) - me.SendZoneUnderAttackMessage(player); + if (killer != null) + { + Player player = killer.GetCharmerOrOwnerPlayerOrPlayerItself(); + if (player != null) + me.SendZoneUnderAttackMessage(player); + } } } }