From c926327077565262e76e7f62728e1c692a5cc4b5 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Tue, 6 Jul 2021 18:27:59 +0200 Subject: [PATCH] Scripts/BWD: removed some unneeded checks in Omnotron's Lord Victor Nefarius script --- .../boss_omnotron_defense_system.cpp | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp index c604ee82216..560614622de 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp @@ -1016,26 +1016,20 @@ struct npc_lord_victor_nefarius_omnotron : public PassiveAI switch (action) { case ACTION_CAST_SHADOW_INFUSION: - if (Creature* electron = _instance->GetCreature(DATA_ELECTRON)) + if (!_abilitiesOnCooldown) { - if (!_abilitiesOnCooldown) - { - DoCastAOE(SPELL_SHADOW_INFUSION); - _events.ScheduleEvent(EVENT_TALK_MANIPULATE_LIGHTNING_CONDUCTOR, 6s); - _abilitiesOnCooldown = true; - _events.ScheduleEvent(EVENT_CLEAR_ABILITY_COOLDOWN, 30s); - } + DoCastAOE(SPELL_SHADOW_INFUSION); + _events.ScheduleEvent(EVENT_TALK_MANIPULATE_LIGHTNING_CONDUCTOR, 6s); + _abilitiesOnCooldown = true; + _events.ScheduleEvent(EVENT_CLEAR_ABILITY_COOLDOWN, 30s); } break; case ACTION_CAST_ENCASING_SHADOWS: - if (Creature* magmatron = _instance->GetCreature(DATA_MAGMATRON)) + if (!_abilitiesOnCooldown) { - if (!_abilitiesOnCooldown) - { - _events.ScheduleEvent(EVENT_ENCASING_SHADOWS, 300ms); - _abilitiesOnCooldown = true; - _events.ScheduleEvent(EVENT_CLEAR_ABILITY_COOLDOWN, 30s); - } + _events.ScheduleEvent(EVENT_ENCASING_SHADOWS, 300ms); + _abilitiesOnCooldown = true; + _events.ScheduleEvent(EVENT_CLEAR_ABILITY_COOLDOWN, 30s); } break; default: