diff options
Diffstat (limited to 'src/server/scripts')
8 files changed, 14 insertions, 16 deletions
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index edde915b73c..154ff8b43e5 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -203,8 +203,8 @@ class boss_blood_council_controller : public CreatureScript { if (!instance->CheckRequiredBosses(DATA_BLOOD_PRINCE_COUNCIL, who->ToPlayer())) { - instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT); EnterEvadeMode(); + instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT); return; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 8d3eace123c..f894a4f97c6 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -159,8 +159,8 @@ class boss_blood_queen_lana_thel : public CreatureScript { if (!instance->CheckRequiredBosses(DATA_BLOOD_QUEEN_LANA_THEL, who->ToPlayer())) { - instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT); EnterEvadeMode(); + instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT); return; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 6f312c3e99b..d8af0a8a3e6 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -277,8 +277,8 @@ class boss_deathbringer_saurfang : public CreatureScript { if (!instance->CheckRequiredBosses(DATA_DEATHBRINGER_SAURFANG, who->ToPlayer())) { - instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT); EnterEvadeMode(); + instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT); return; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index a5f9c748bb5..fff982fe7d9 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -123,8 +123,8 @@ class boss_festergut : public CreatureScript { if (!instance->CheckRequiredBosses(DATA_FESTERGUT, who->ToPlayer())) { - instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT); EnterEvadeMode(); + instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT); return; } @@ -270,7 +270,7 @@ class boss_festergut : public CreatureScript if (Creature* gasDummy = ObjectAccessor::GetCreature(*me, gasDummyGUID)) for (uint8 i = 0; i < 3; ++i) { - gasDummy->RemoveAurasDueToSpell(gaseousBlight[i]); + me->RemoveAurasDueToSpell(gaseousBlight[i]); gasDummy->RemoveAurasDueToSpell(gaseousBlightVisual[i]); } } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 1e1ce88c1a2..f9721c5d066 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -225,8 +225,8 @@ class boss_lady_deathwhisper : public CreatureScript { if (!instance->CheckRequiredBosses(DATA_LADY_DEATHWHISPER, who->ToPlayer())) { - instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT); EnterEvadeMode(); + instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT); return; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index e29ddc4a150..89eba957708 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -214,18 +214,13 @@ class boss_professor_putricide : public CreatureScript if (events.GetPhaseMask() & PHASE_MASK_NOT_SELF) return; - if (!(events.GetPhaseMask() & PHASE_MASK_NOT_SELF) && !instance->CheckRequiredBosses(DATA_PROFESSOR_PUTRICIDE, who->ToPlayer())) + if (!instance->CheckRequiredBosses(DATA_PROFESSOR_PUTRICIDE, who->ToPlayer())) { - instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT); EnterEvadeMode(); + instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT); return; } - _SetPhase(PHASE_COMBAT_1); - Talk(SAY_AGGRO); - DoCast(me, SPELL_OOZE_TANK_PROTECTION, true); - DoZoneInCombat(me); - events.Reset(); events.ScheduleEvent(EVENT_BERSERK, 600000); events.ScheduleEvent(EVENT_SLIME_PUDDLE, 10000); @@ -233,6 +228,11 @@ class boss_professor_putricide : public CreatureScript if (IsHeroic()) events.ScheduleEvent(EVENT_UNBOUND_PLAGUE, 20000); + _SetPhase(PHASE_COMBAT_1); + Talk(SAY_AGGRO); + DoCast(me, SPELL_OOZE_TANK_PROTECTION, true); + DoZoneInCombat(me); + instance->SetBossState(DATA_PROFESSOR_PUTRICIDE, IN_PROGRESS); if (GameObject* table = ObjectAccessor::GetGameObject(*me, instance->GetData64(DATA_PUTRICIDE_TABLE))) table->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index f71f7ce1b5c..43e07c0521a 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -115,8 +115,8 @@ class boss_rotface : public CreatureScript { if (!instance->CheckRequiredBosses(DATA_ROTFACE, who->ToPlayer())) { - instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT); EnterEvadeMode(); + instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT); return; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 7814137ae23..c739364d23d 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -384,8 +384,6 @@ class instance_icecrown_citadel : public InstanceMapScript HandleGameObject(putricidePipes[1], true); } break; - case DATA_BLOOD_PRINCE_COUNCIL: - case DATA_BLOOD_QUEEN_LANA_THEL: case DATA_VALITHRIA_DREAMWALKER: case DATA_SINDRAGOSA: case DATA_THE_LICH_KING: |