From 746fce30d9a56ed59b53f1e1a93c9c8c3417e16b Mon Sep 17 00:00:00 2001 From: Nyeriah Date: Sat, 8 Jul 2017 12:37:03 -0300 Subject: Scripts/Karazhan: Fix Attumen and Midnight not moving towards each other on phase transition after latest changes --- .../scripts/EasternKingdoms/Karazhan/boss_midnight.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index 75b119e9936..80701692e97 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -238,30 +238,31 @@ public: midnight->AttackStop(); midnight->RemoveAllAttackers(); midnight->SetReactState(REACT_PASSIVE); - midnight->GetMotionMaster()->MoveChase(me); + midnight->GetMotionMaster()->MoveFollow(me, 2.0f, 0.0f); midnight->AI()->Talk(EMOTE_MOUNT_UP); me->AttackStop(); me->RemoveAllAttackers(); me->SetReactState(REACT_PASSIVE); - me->GetMotionMaster()->MoveChase(midnight); + me->GetMotionMaster()->MoveFollow(midnight, 2.0f, 0.0f); Talk(SAY_MOUNT); - scheduler.Schedule(Seconds(3), [this](TaskContext task) + scheduler.Schedule(Seconds(1), [this](TaskContext task) { if (Creature* midnight = ObjectAccessor::GetCreature(*me, _midnightGUID)) { - if (me->IsWithinMeleeRange(midnight)) + if (me->IsWithinDist2d(midnight, 5.0f)) { DoCastAOE(SPELL_SUMMON_ATTUMEN_MOUNTED); me->SetVisible(false); + me->GetMotionMaster()->Clear(); midnight->SetVisible(false); } else { - midnight->GetMotionMaster()->MoveChase(me); - me->GetMotionMaster()->MoveChase(midnight); - task.Repeat(Seconds(3)); + midnight->GetMotionMaster()->MoveFollow(me, 2.0f, 0.0f); + me->GetMotionMaster()->MoveFollow(midnight, 2.0f, 0.0f); + task.Repeat(); } } }); -- cgit v1.2.3