From b3f75852c284e730756a7f007b96bbae0ac3c158 Mon Sep 17 00:00:00 2001
From: Sorikoff <46191832+Sorikoff@users.noreply.github.com>
Date: Mon, 25 Feb 2019 08:36:36 +0000
Subject: Allow walk when chasing (#23069)

(cherry picked from commit c2f2db08aa4f729fbd5b21528a215f6df0c131b6)
---
 src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp | 3 +--
 src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp   | 9 +++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/server/scripts')

diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index e9219d3c110..1a9c39fa454 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -675,9 +675,8 @@ struct npc_dark_rider_of_acherus : public ScriptedAI
             {
                 case EVENT_START_MOVING:
                     me->SetTarget(_horseGUID);
-                    me->SetWalk(true);
                     if (Creature* horse = ObjectAccessor::GetCreature(*me, _horseGUID))
-                        me->GetMotionMaster()->MoveChase(horse);
+                        me->GetMotionMaster()->MoveChase(horse, {}, {}, true);
                     _events.ScheduleEvent(EVENT_DESPAWN_HORSE, 5s);
                     break;
                 case EVENT_DESPAWN_HORSE:
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index b1507498aee..09ce00cde6c 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -907,6 +907,15 @@ class boss_thaladred_the_darkener : public CreatureScript
                 advisorbase_ai::Reset();
             }
 
+            void AttackStart(Unit* who) override
+            {
+                if (!who || _inFakeDeath || me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE))
+                    return;
+
+                if (me->Attack(who, true))
+                    me->GetMotionMaster()->MoveChase(who, {}, {}, true);
+            }
+
             void JustEngagedWith(Unit* who) override
             {
                 Talk(SAY_THALADRED_AGGRO);
-- 
cgit v1.2.3