aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2019-12-21 13:06:42 +0100
committerShauren <shauren.trinity@gmail.com>2021-12-19 13:12:30 +0100
commite539de68e10a64b0f0a0619eb5213ab5315b01c9 (patch)
tree49078beca2d848a6b4e0675a9052d74eaf32e6a9 /src
parent7fb3b89d1d01d24de8e721915aa81452ee00102a (diff)
Core/Creatures: Fixed crash when guards get killed by periodic auras whose caster is offline or despawned
(cherry picked from commit 046e98bc5da89c31af9f68d18d78d8f8e9161f6a)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/AI/CoreAI/GuardAI.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp
index 0ee4c652e98..67c265157b7 100644
--- a/src/server/game/AI/CoreAI/GuardAI.cpp
+++ b/src/server/game/AI/CoreAI/GuardAI.cpp
@@ -67,6 +67,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);
}