diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 058286261dd..4641e79d52f 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -167,15 +167,12 @@ struct boss_felblood_kaelthas : public BossAI instance->SetBossState(DATA_KAELTHAS_SUNSTRIDER, DONE); } - void EnterEvadeMode(EvadeReason why) override + void EnterEvadeMode(EvadeReason /*why*/) override { DoCastAOE(SPELL_CLEAR_FLIGHT, true); _EnterEvadeMode(); summons.DespawnAll(); - events.Reset(); - me->ReleaseFocus(); - me->SetReactState(REACT_AGGRESSIVE); - BossAI::EnterEvadeMode(why); + _DespawnAtEvade(); } void DamageTaken(Unit* attacker, uint32 &damage) override diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index efbbd177f28..bafc264ed47 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -174,10 +174,6 @@ class instance_magisters_terrace : public InstanceMapScript switch (go->GetEntry()) { - case GO_KAEL_STATUE_1: - case GO_KAEL_STATUE_2: - _statueGUIDs.push_back(go->GetGUID()); - break; case GO_ESCAPE_ORB: if (GetBossState(DATA_KAELTHAS_SUNSTRIDER) == DONE) go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); @@ -220,12 +216,7 @@ class instance_magisters_terrace : public InstanceMapScript _delrissaDeathCount = 0; break; case DATA_KAELTHAS_SUNSTRIDER: - if (state == NOT_STARTED) - { - for (ObjectGuid guid : _statueGUIDs) - HandleGameObject(guid, false); - } - else if (state == DONE) + if (state == DONE) if (GameObject* orb = GetGameObject(DATA_ESCAPE_ORB)) orb->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); break; @@ -247,7 +238,6 @@ class instance_magisters_terrace : public InstanceMapScript protected: EventMap _events; - GuidVector _statueGUIDs; GuidSet _kaelthasPreTrashGUIDs; uint8 _delrissaDeathCount; uint8 _kaelthasIntroState; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h index 8e0b4336b29..e423e40b9c8 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h @@ -80,8 +80,6 @@ enum MTGameObjectIds GO_SUNWELL_RAID_GATE_4 = 187770, GO_SUNWELL_RAID_GATE_5 = 187896, GO_ASYLUM_DOOR = 188064, - GO_KAEL_STATUE_1 = 188165, - GO_KAEL_STATUE_2 = 188166, GO_ESCAPE_ORB = 188173 };