diff options
| -rw-r--r-- | src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp | 21 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h | 2 |
2 files changed, 14 insertions, 9 deletions
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 1a0987625df..62c85491a20 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -131,16 +131,11 @@ public: { boss_onyxiaAI(Creature* creature) : BossAI(creature, DATA_ONYXIA) { - Reset(); + Initialize(); } - void Reset() override + void Initialize() { - if (!IsCombatMovementAllowed()) - SetCombatMovement(true); - - _Reset(); - Phase = PHASE_START; MovePoint = urand(0, 5); PointData = GetMoveData(); @@ -148,6 +143,16 @@ public: triggerGUID = 0; tankGUID = 0; IsMoving = false; + } + + void Reset() override + { + Initialize(); + + if (!IsCombatMovementAllowed()) + SetCombatMovement(true); + + _Reset(); instance->SetData(DATA_ONYXIA_PHASE, Phase); instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); @@ -393,7 +398,7 @@ public: } if (!me->isMoving()) - if (Creature* trigger = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_TRIGGER_GUID))) + if (Creature* trigger = ObjectAccessor::GetCreature(*me, triggerGUID)) me->SetFacingToObject(trigger); events.Update(diff); diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h index 9fd73f7a977..c31988843fe 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h +++ b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h @@ -37,7 +37,7 @@ enum Data32 enum Data64 { DATA_ONYXIA_GUID = 0, - DATA_FLOOR_ERUPTION_GUID = 1, + DATA_FLOOR_ERUPTION_GUID = 1 }; enum OnyxiaPhases |