From d90e368166c552e73c24e3bbd07a1a3f031ef091 Mon Sep 17 00:00:00 2001
From: UltraNix <80540499+UltraNix@users.noreply.github.com>
Date: Mon, 3 Jan 2022 21:06:41 +0100
Subject: [PATCH] Fix (Core/Movement): During escort movement, do not stop
 moving if unit is casting channeled spells. (#9815)

Fixes #9286
---
 .../Movement/MovementGenerators/EscortMovementGenerator.cpp     | 2 +-
 src/server/game/Spells/SpellMgr.cpp                             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp
index a453b7e4e..2f85ced8c 100644
--- a/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp
@@ -52,7 +52,7 @@ bool EscortMovementGenerator<T>::DoUpdate(T* unit, uint32  /*diff*/)
 
     if (unit->HasUnitState(UNIT_STATE_NOT_MOVE) || unit->IsMovementPreventedByCasting())
     {
-        unit->StopMoving();
+        unit->ClearUnitState(UNIT_STATE_ROAMING_MOVE);
         return true;
     }
 
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 8d40b9962..18f5006e4 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -6187,6 +6187,7 @@ void SpellMgr::LoadDbcDataCorrections()
     ApplySpellFix({ 69768 }, [](SpellEntry* spellInfo)
     {
         spellInfo->EffectImplicitTargetA[0] = TARGET_UNIT_TARGET_ANY;
+        spellInfo->AttributesEx5 |= SPELL_ATTR5_ALLOW_ACTION_DURING_CHANNEL;
     });
 
     ApplySpellFix({ 69767 }, [](SpellEntry* spellInfo)