aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2024-01-01 23:49:11 +0100
committerShauren <shauren.trinity@gmail.com>2024-01-01 23:49:11 +0100
commit29d9790402fee3471d600d22b826d9d59ddd2ce0 (patch)
treea843900eac5ef766fda13644b600b432b687b044
parent6db980b69eed8275a9ffb474bae3ddbbd8cedfe9 (diff)
Scripts/Karazhan: Removed a custom reimplementation of DoMeleeAttackIfReady (written before dual wield was supported by it)
-rw-r--r--src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp24
1 files changed, 1 insertions, 23 deletions
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)