From cc0c56ceae69cab3133e3efc8173b4fd857852da Mon Sep 17 00:00:00 2001
From: Killyana <morphone1@gmail.com>
Date: Sun, 22 Mar 2020 16:11:19 +0100
Subject: Core/AI: Fix reset and interruption of non melee spells

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

(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 e028665e843..9fb915a436a 100644
--- a/src/server/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
@@ -205,6 +205,11 @@ void CreatureAI::JustAppeared()
     }
 }
 
+void CreatureAI::JustReachedHome()
+{
+    Reset();
+}
+
 void CreatureAI::JustEnteredCombat(Unit* who)
 {
     if (!IsEngaged() && !me->CanHaveThreatList())
@@ -234,7 +239,6 @@ void CreatureAI::EnterEvadeMode(EvadeReason why)
         }
     }
 
-    Reset();
 }
 
 bool CreatureAI::UpdateVictim()
@@ -276,6 +280,7 @@ void CreatureAI::EngagementStart(Unit* who)
     }
     _isEngaged = true;
 
+    me->InterruptNonMeleeSpells(false);
     me->AtEngage(who);
 }
 
-- 
cgit v1.2.3