From d946d74ff9f2d4bec8b78a6b7ea85fbb9daefeb5 Mon Sep 17 00:00:00 2001
From: Killyana <morphone1@gmail.com>
Date: Mon, 30 Dec 2019 19:03:14 +0100
Subject: Core/AI: Fix creatures not updating their target properly once
 engaged

Closes  #21562

(cherry picked from commit 7fb74326205acbc5c0fa6b2aa9731d891e788d64)
---
 src/server/game/AI/SmartScripts/SmartAI.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp
index 3767f254eeb..bb41d3427aa 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.cpp
+++ b/src/server/game/AI/SmartScripts/SmartAI.cpp
@@ -285,6 +285,8 @@ void SmartAI::UpdateAI(uint32 diff)
 
     CheckConditions(diff);
 
+    bool hasVictim = UpdateVictim();
+
     GetScript()->OnUpdate(diff);
 
     UpdatePath(diff);
@@ -294,7 +296,7 @@ void SmartAI::UpdateAI(uint32 diff)
     if (!IsAIControlled())
         return;
 
-    if (!UpdateVictim())
+    if (!hasVictim)
         return;
 
     if (_canAutoAttack)
-- 
cgit v1.2.3