From 439f8da207b58c6dd5f64faa8b02c60a4da2c4d3 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 1 Jan 2024 23:49:11 +0100 Subject: Scripts/Karazhan: Removed a custom reimplementation of DoMeleeAttackIfReady (written before dual wield was supported by it) (cherry picked from commit 29d9790402fee3471d600d22b826d9d59ddd2ce0) --- .../Karazhan/boss_prince_malchezaar.cpp | 24 +--------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'src') diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 68699394ad4..ec383112be7 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -551,29 +551,7 @@ public: } else EnfeebleTimer -= diff; } - if (phase == 2) - DoMeleeAttacksIfReady(); - else - DoMeleeAttackIfReady(); - } - - void DoMeleeAttacksIfReady() - { - if (me->IsWithinMeleeRange(me->GetVictim()) && !me->IsNonMeleeSpellCast(false)) - { - //Check for base attack - if (me->isAttackReady() && me->GetVictim()) - { - me->AttackerStateUpdate(me->GetVictim()); - me->resetAttackTimer(); - } - //Check for offhand attack - if (me->isAttackReady(OFF_ATTACK) && me->GetVictim()) - { - me->AttackerStateUpdate(me->GetVictim(), OFF_ATTACK); - me->resetAttackTimer(OFF_ATTACK); - } - } + DoMeleeAttackIfReady(); } void Cleanup(Creature* infernal, InfernalPoint *point) -- cgit v1.2.3