From 6eb49e4bb20647cf45eb17cbdbf98e412686a7e6 Mon Sep 17 00:00:00 2001
From: treeston <treeston.mmoc@gmail.com>
Date: Sat, 5 Mar 2016 13:29:49 +0100
Subject: Unit/PlayerAI: Yeah, we allow charmer to be null now, should probably
 check for that.

Fixes and closes #16728.

(cherry picked from commit 49de12b1cfaca7f089a1ba2660de4a8644a72e2c)
---
 src/server/game/AI/PlayerAI/PlayerAI.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/server/game/AI/PlayerAI/PlayerAI.cpp b/src/server/game/AI/PlayerAI/PlayerAI.cpp
index 91258b549f9..cdd2de792e4 100644
--- a/src/server/game/AI/PlayerAI/PlayerAI.cpp
+++ b/src/server/game/AI/PlayerAI/PlayerAI.cpp
@@ -147,6 +147,8 @@ Unit* SimpleCharmedPlayerAI::SelectAttackTarget() const
 void SimpleCharmedPlayerAI::UpdateAI(const uint32 /*diff*/)
 {
     Creature* charmer = me->GetCharmer() ? me->GetCharmer()->ToCreature() : nullptr;
+    if (!charmer)
+        return;
 
     //kill self if charm aura has infinite duration
     if (charmer->IsInEvadeMode())
-- 
cgit v1.2.3