diff options
| author | ccrs <ccrs@users.noreply.github.com> | 2019-07-12 20:38:50 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-16 00:11:25 +0100 |
| commit | 49bc6533fd03246a48d6997a0f50915c0cec86eb (patch) | |
| tree | 936e26a6756bb8ec245a9b6d4e6ca399453d9fef | |
| parent | 8c35206bb5a6d4f98e941f7140f597433345bd4c (diff) | |
Scripts/ScarletEnclave: 4ee84bb followup
(cherry picked from commit 81475f709f067eea0437361e7098b7a6b9cf3a26)
| -rw-r--r-- | src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 348d3f31e6c..44c13ff1aea 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -453,6 +453,7 @@ class npc_eye_of_acherus : public CreatureScript ScriptedAI::JustAppeared(); DoCastSelf(SPELL_EYE_VISUAL); + DoCastSelf(SPELL_EYE_FLIGHT); Movement::MoveSplineInit init(me); init.MoveTo(PositionToVector3(EyeOFAcherusFallPoint), false); @@ -472,14 +473,12 @@ class npc_eye_of_acherus : public CreatureScript { case EVENT_MOVE_START: { - DoCastSelf(SPELL_EYE_FLIGHT_BOOST); me->SetControlled(false, UNIT_STATE_ROOT); - if (Player* owner = me->GetCharmerOrOwnerPlayerOrPlayerItself()) - { - for (uint8 itr = 0; itr < MAX_MOVE_TYPE; ++itr) - me->SetSpeedRate(UnitMoveType(itr), owner->GetSpeedRate(UnitMoveType(itr))); + + DoCastSelf(SPELL_EYE_FLIGHT_BOOST); + + if (Unit* owner = me->GetCharmerOrOwner()) Talk(TALK_MOVE_START, owner); - } Movement::PointsArray path(EyeOfAcherusPath, EyeOfAcherusPath + EyeOfAcherusPathSize); Movement::MoveSplineInit init(me); @@ -505,17 +504,8 @@ class npc_eye_of_acherus : public CreatureScript break; case POINT_EYE_MOVE_END: me->RemoveAurasDueToSpell(SPELL_EYE_FLIGHT_BOOST); - if (Player* owner = me->GetCharmerOrOwnerPlayerOrPlayerItself()) - { - owner->RemoveAurasDueToSpell(SPELL_EYE_FLIGHT_BOOST); - for (uint8 itr = 0; itr < MAX_MOVE_TYPE; ++itr) - me->SetSpeedRate(UnitMoveType(itr), owner->GetSpeedRate(UnitMoveType(itr))); + if (Unit* owner = me->GetCharmerOrOwner()) Talk(TALK_CONTROL, owner); - - - owner->PossessSpellInitialize(); - } - DoCastSelf(SPELL_EYE_FLIGHT); break; default: break; |