From a853bacd1d08825c1676827dc629902c99d20942 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 21 Dec 2019 13:06:42 +0100 Subject: [PATCH] Core/Creatures: Fixed crash when guards get killed by periodic auras whose caster is offline or despawned --- src/server/game/AI/CoreAI/GuardAI.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp index 2b358945bd..b39532602f 100644 --- a/src/server/game/AI/CoreAI/GuardAI.cpp +++ b/src/server/game/AI/CoreAI/GuardAI.cpp @@ -78,6 +78,7 @@ void GuardAI::EnterEvadeMode(EvadeReason /*why*/) void GuardAI::JustDied(Unit* killer) { - if (Player* player = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) - me->SendZoneUnderAttackMessage(player); + if (killer) + if (Player* player = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) + me->SendZoneUnderAttackMessage(player); }