From 605e5f94c0d71cad8e83fa5a07eaec4e6bed9cc3 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 8 Jan 2024 22:23:12 +0100 Subject: Core/Creatures: Moved autoattack handling from scripts to game --- .../Shadowlands/SepulcherOfTheFirstOnes/boss_anduin_wrynn.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/server/scripts/Shadowlands') diff --git a/src/server/scripts/Shadowlands/SepulcherOfTheFirstOnes/boss_anduin_wrynn.cpp b/src/server/scripts/Shadowlands/SepulcherOfTheFirstOnes/boss_anduin_wrynn.cpp index 0a511949c71..5f959dfa579 100644 --- a/src/server/scripts/Shadowlands/SepulcherOfTheFirstOnes/boss_anduin_wrynn.cpp +++ b/src/server/scripts/Shadowlands/SepulcherOfTheFirstOnes/boss_anduin_wrynn.cpp @@ -1026,8 +1026,6 @@ struct boss_anduin_wrynn : public BossAI if (me->HasUnitState(UNIT_STATE_CASTING)) return; } - - DoMeleeAttackIfReady(); } void StartIntermission(uint8 intermissionNum) @@ -1631,8 +1629,6 @@ struct npc_anduin_wrynn_fiendish_soul : public ScriptedAI break; } } - - DoMeleeAttackIfReady(); } private: @@ -1711,7 +1707,6 @@ struct npc_anduin_wrynn_monstrous_soul : public ScriptedAI break; } } - DoMeleeAttackIfReady(); } private: @@ -1865,8 +1860,6 @@ struct boss_remnant_of_a_fallen_king : public ScriptedAI if (me->HasUnitState(UNIT_STATE_CASTING)) return; } - - DoMeleeAttackIfReady(); } private: @@ -1951,6 +1944,7 @@ struct npc_anduin_wrynn_sylvanas : public ScriptedAI void JustAppeared() override { me->SetReactState(REACT_AGGRESSIVE); + me->SetCanMelee(false); // DoSpellAttackIfReady } void Reset() override @@ -2008,6 +2002,7 @@ struct npc_anduin_wrynn_jaina : public ScriptedAI void JustAppeared() override { me->SetReactState(REACT_AGGRESSIVE); + me->SetCanMelee(false); // DoSpellAttackIfReady } void Reset() override @@ -2126,8 +2121,6 @@ struct npc_anduin_wrynn_uther : public ScriptedAI break; } } - - DoMeleeAttackIfReady(); } private: -- cgit v1.2.3