From 9c603ea87f09c47d52f093ccc73ee75c15eff6f5 Mon Sep 17 00:00:00 2001
From: Treeston <treeston.mmoc@gmail.com>
Date: Wed, 31 Jul 2019 13:17:32 +0200
Subject: Core/Combat: Properly unset engagement flag on death.

---
 src/server/game/AI/CreatureAI.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/server/game/AI/CreatureAI.cpp')

diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp
index 141b0a82082..5c87fc8806d 100644
--- a/src/server/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
@@ -240,6 +240,12 @@ bool CreatureAI::UpdateVictim()
     if (!IsEngaged())
         return false;
 
+    if (!me->IsAlive())
+    {
+        EngagementOver();
+        return false;
+    }
+
     if (!me->HasReactState(REACT_PASSIVE))
     {
         if (Unit* victim = me->SelectVictim())
-- 
cgit v1.2.3