diff options
| author | ccrs <ccrs@users.noreply.github.com> | 2019-07-12 20:38:50 +0200 |
|---|---|---|
| committer | ccrs <ccrs@users.noreply.github.com> | 2019-07-12 20:38:50 +0200 |
| commit | 81475f709f067eea0437361e7098b7a6b9cf3a26 (patch) | |
| tree | 801a9f0c379244522504a3e6778578e47791ccb0 /src | |
| parent | fa9a4ee20d6a63f2e99e9feb45cd0ecf83ccc7f5 (diff) | |
Scripts/ScarletEnclave: 4ee84bb followup
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 88254515616..90ab1e8f40e 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -446,6 +446,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); @@ -465,14 +466,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); @@ -498,14 +497,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); - } - DoCastSelf(SPELL_EYE_FLIGHT); break; default: break; |