diff options
Diffstat (limited to 'src/server/scripts/Kalimdor')
| -rw-r--r-- | src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_azshara.cpp | 22 |
2 files changed, 18 insertions, 8 deletions
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 1fe47520fee..6efe482eac9 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -409,7 +409,7 @@ public: if (!HasProtected) { - me->GetMotionMaster()->Clear(false); + me->GetMotionMaster()->Clear(); me->GetMotionMaster()->MoveIdle(); // All members of raid must get this buff @@ -496,7 +496,7 @@ public: switch (actionId) { case ACTION_ENRAGE: - me->GetMotionMaster()->Clear(false); + me->GetMotionMaster()->Clear(); me->GetMotionMaster()->MoveIdle(); Enraged = true; Talk(SAY_ENRAGE); diff --git a/src/server/scripts/Kalimdor/zone_azshara.cpp b/src/server/scripts/Kalimdor/zone_azshara.cpp index cb607486e74..5cfcb2355f5 100644 --- a/src/server/scripts/Kalimdor/zone_azshara.cpp +++ b/src/server/scripts/Kalimdor/zone_azshara.cpp @@ -195,7 +195,9 @@ public: { me->DespawnOrUnsummon(); return; - } else MustDieTimer -= diff; + } + else + MustDieTimer -= diff; } if (!Escape) @@ -207,7 +209,9 @@ public: { DoCast(me, SPELL_RIZZLE_ESCAPE, false); SpellEscapeTimer = 10000; - } else SpellEscapeTimer -= diff; + } + else + SpellEscapeTimer -= diff; if (TeleportTimer <= diff) { @@ -224,10 +228,12 @@ public: me->SetHover(true); me->SetSwim(true); me->SetSpeedRate(MOVE_RUN, 0.85f); - me->GetMotionMaster()->MovementExpired(); + me->GetMotionMaster()->Clear(MOTION_PRIORITY_NORMAL); me->GetMotionMaster()->MovePoint(CurrWP, WPs[CurrWP]); Escape = true; - } else TeleportTimer -= diff; + } + else + TeleportTimer -= diff; return; } @@ -246,7 +252,9 @@ public: DoCast(player, SPELL_RIZZLE_FROST_GRENADE, true); } GrenadeTimer = 30000; - } else GrenadeTimer -= diff; + } + else + GrenadeTimer -= diff; if (CheckTimer <= diff) { @@ -268,7 +276,9 @@ public: } CheckTimer = 1000; - } else CheckTimer -= diff; + } + else + CheckTimer -= diff; } bool GossipHello(Player* player) override |