aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2019-12-21 13:06:42 +0100
committerShauren <shauren.trinity@gmail.com>2019-12-21 13:06:42 +0100
commit046e98bc5da89c31af9f68d18d78d8f8e9161f6a (patch)
tree11ab49750623bb566486761b2817166577c07b51
parent5c0aa2f2bd1d1c734e0bcc68fd1f8adaae38cbe9 (diff)
Core/Creatures: Fixed crash when guards get killed by periodic auras whose caster is offline or despawned
-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 daa25297be8..6cc965c261d 100644
--- a/src/server/game/AI/CoreAI/GuardAI.cpp
+++ b/src/server/game/AI/CoreAI/GuardAI.cpp
@@ -72,6 +72,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);
}