aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
authorSorikoff <46191832+Sorikoff@users.noreply.github.com>2019-02-25 08:36:36 +0000
committerGiacomo Pozzoni <giacomopoz@gmail.com>2019-02-25 09:36:36 +0100
commitc2f2db08aa4f729fbd5b21528a215f6df0c131b6 (patch)
tree45c4d1d79271204fc73ad39e713e145aa8ff9a70 /src/server/scripts
parent47e1816bf78ea3050150fa3d4b0a93d8b9b10807 (diff)
Allow walk when chasing (#23069)
Diffstat (limited to 'src/server/scripts')
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp3
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp9
2 files changed, 10 insertions, 2 deletions
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index fe2204b0354..c312bca4268 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -670,9 +670,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 0e606ec8830..aca35a0c537 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -908,6 +908,15 @@ class boss_thaladred_the_darkener : public CreatureScript
advisorbase_ai::Reset();
}
+ void AttackStart(Unit* who) override
+ {
+ if (!who || _inFakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+ return;
+
+ if (me->Attack(who, true))
+ me->GetMotionMaster()->MoveChase(who, {}, {}, true);
+ }
+
void JustEngagedWith(Unit* who) override
{
Talk(SAY_THALADRED_AGGRO);