Scripts/Onyxia Lair: Slight change so we don't call Reset() in the 'ctor

This commit is contained in:
Nyeriah
2014-09-08 18:00:21 -03:00
parent e181af1b1c
commit 8907904757
2 changed files with 14 additions and 9 deletions

View File

@@ -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);

View File

@@ -37,7 +37,7 @@ enum Data32
enum Data64
{
DATA_ONYXIA_GUID = 0,
DATA_FLOOR_ERUPTION_GUID = 1,
DATA_FLOOR_ERUPTION_GUID = 1
};
enum OnyxiaPhases