Core/Creatures: Moved autoattack handling from scripts to game

68 files changed, 28 insertions, 265 deletions

diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
index 456ceb98b0a..297caf347f0 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
@@ -189,8 +189,6 @@ struct boss_exarch_maladaar : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
@@ -337,10 +335,7 @@ struct npc_stolen_soul : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        _scheduler.Update(diff, [this]
-        {
-            DoMeleeAttackIfReady();
-        });
+        _scheduler.Update(diff);
     }
 
 private:
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
index e1bb2798032..ab70b02cb57 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
@@ -150,8 +150,6 @@ struct boss_shirrak_the_dead_watcher : public BossAI
             }
             FocusFire_Timer = 15000 + (rand32() % 5000);
         } else FocusFire_Timer -= diff;
-
-        DoMeleeAttackIfReady();
     }
 };
 
@@ -192,8 +190,6 @@ struct npc_focus_fire : public ScriptedAI
 
             FieryBlast_Timer = 1000;
         } else FieryBlast_Timer -= diff;
-
-        DoMeleeAttackIfReady();
     }
 };
 
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
index c42902b6085..2206ca223df 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
@@ -332,8 +332,6 @@ struct npc_yor : public ScriptedAI
                     break;
             }
         }
-
-        DoMeleeAttackIfReady();
     }
 
     private:
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
index db3559a32de..dc75a3d01c0 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
@@ -151,8 +151,6 @@ struct boss_anzu : public BossAI
                     break;
             }
         }
-
-        DoMeleeAttackIfReady();
     }
 
     private:
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
index 813d5ce4e46..7638c6f7e1f 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
@@ -164,8 +164,6 @@ struct boss_ambassador_hellmaw : public EscortAI
                     break;
             }
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
index d7d3c6245c7..05b01283d1d 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
@@ -163,8 +163,6 @@ struct boss_blackheart_the_inciter : public BossAI
             if (me->HasReactState(REACT_PASSIVE) || me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 
     void WaypointReached(uint32 waypointId, uint32 pathId) override
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
index de1d1107cd2..8bcaf3d5faf 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
@@ -166,8 +166,6 @@ struct boss_grandmaster_vorpil : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 };
 
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
index 47655500d92..8165adca845 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
@@ -148,8 +148,6 @@ struct boss_murmur : public BossAI
 
         if (!me->IsWithinMeleeRange(me->GetVictim()))
             me->GetThreatManager().ResetThreat(me->GetVictim());
-
-        DoMeleeAttackIfReady();
     }
 };
 
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
index c7af1be4c76..b8cad82d8a7 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
@@ -167,7 +167,6 @@ struct npc_wrathbone_flayer : public ScriptedAI
                     break;
             }
         }
-        DoMeleeAttackIfReady();
     }
 
 private:
@@ -225,8 +224,6 @@ struct npc_angered_soul_fragment : public ScriptedAI
 
         if (me->HasUnitState(UNIT_STATE_CASTING))
             return;
-
-        DoMeleeAttackIfReady();
     }
 
 private:
diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
index a8da948a5aa..cb73cfbb607 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
@@ -263,8 +263,6 @@ struct boss_gurtogg_bloodboil : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 
     void ChangePhase()
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index ed26aa1867b..7256342ef56 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -1037,8 +1037,6 @@ struct boss_illidan_stormrage : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
@@ -1359,8 +1357,6 @@ struct npc_akama_illidan : public ScriptedAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
@@ -1415,8 +1411,6 @@ struct npc_parasitic_shadowfiend : public ScriptedAI
 
         if (!UpdateVictim())
             return;
-
-        DoMeleeAttackIfReady();
     }
 
 private:
@@ -1531,8 +1525,6 @@ struct npc_flame_of_azzinoth : public ScriptedAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 
     void JustDied(Unit* /*killer*/) override
@@ -1753,8 +1745,6 @@ struct npc_maiev : public ScriptedAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
index ae4fa8522c9..d4e04e9b8c5 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
@@ -450,7 +450,10 @@ private:
 
 struct boss_lady_malande : public IllidariCouncilBossAI
 {
-    boss_lady_malande(Creature* creature) : IllidariCouncilBossAI(creature, DATA_LADY_MALANDE) { }
+    boss_lady_malande(Creature* creature) : IllidariCouncilBossAI(creature, DATA_LADY_MALANDE)
+    {
+        me->SetCanMelee(false); // DoSpellAttackIfReady
+    }
 
     void ScheduleEvents() override
     {
diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
index 2deea39af21..049ecbb80bb 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
@@ -376,8 +376,6 @@ struct boss_essence_of_suffering : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 private:
     bool _dead;
@@ -481,8 +479,6 @@ struct boss_essence_of_desire : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 private:
     bool _dead;
@@ -579,8 +575,6 @@ struct boss_essence_of_anger : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
@@ -641,8 +635,6 @@ struct npc_enslaved_soul : public ScriptedAI
             return;
 
         _scheduler.Update(diff);
-
-        DoMeleeAttackIfReady();
     }
 
 private:
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index e1c9b76bc48..6ba5bebf0d8 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -337,8 +337,6 @@ struct boss_shade_of_akama : public BossAI
                     break;
             }
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
@@ -518,8 +516,6 @@ struct npc_akama_shade : public ScriptedAI
         {
             if (!UpdateVictim())
                 return;
-
-            DoMeleeAttackIfReady();
         }
     }
 
@@ -757,8 +753,6 @@ struct npc_ashtongue_sorcerer : public ScriptedAI
 
         if (!UpdateVictim())
             return;
-
-        DoMeleeAttackIfReady();
     }
 
 private:
@@ -825,8 +819,6 @@ struct npc_ashtongue_defender : public ScriptedAI
                     break;
             }
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
@@ -883,8 +875,6 @@ struct npc_ashtongue_rogue : public ScriptedAI
                     break;
             }
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
@@ -941,8 +931,6 @@ struct npc_ashtongue_elementalist : public ScriptedAI
                     break;
             }
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
@@ -1029,8 +1017,6 @@ struct npc_ashtongue_spiritbinder : public ScriptedAI
 
         if (!UpdateVictim())
             return;
-
-        DoMeleeAttackIfReady();
     }
 
 private:
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
index 366848cb07c..fa05e56fe88 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -187,8 +187,6 @@ struct boss_teron_gorefiend : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 };
 
@@ -272,10 +270,7 @@ struct npc_shadowy_construct : public ScriptedAI
         if (me->HasUnitState(UNIT_STATE_CASTING))
             return;
 
-        _scheduler.Update(diff, [this]
-        {
-            DoMeleeAttackIfReady();
-        });
+        _scheduler.Update(diff);
     }
 
     void SelectNewTarget()
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
index 3eb49532f94..ec0a2031a71 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
@@ -274,8 +274,6 @@ struct boss_fathomlord_karathress : public BossAI
                 Talk(SAY_GAIN_BLESSING);
             }
         }
-
-        DoMeleeAttackIfReady();
     }
 };
 
@@ -406,8 +404,6 @@ struct boss_fathomguard_sharkkis : public ScriptedAI
                 }
             }
         } else Pet_Timer -= diff;
-
-        DoMeleeAttackIfReady();
     }
 };
 
@@ -516,8 +512,6 @@ struct boss_fathomguard_tidalvess : public ScriptedAI
         }
         else
             Earthbind_Timer -= diff;
-
-        DoMeleeAttackIfReady();
     }
 };
 
@@ -630,8 +624,6 @@ struct boss_fathomguard_caribdis : public ScriptedAI
         }
         else
             Heal_Timer -= diff;
-
-        DoMeleeAttackIfReady();
     }
 
     Unit* selectAdvisorUnit()
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
index f22d7fe791a..bca8c87145f 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
@@ -372,8 +372,6 @@ struct boss_hydross_the_unstable : public BossAI
             DoCast(me, SPELL_ENRAGE);
             EnrageTimer = 60000;
         } else EnrageTimer -= diff;
-
-        DoMeleeAttackIfReady();
     }
 };
 
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
index 6cec120340f..8b7b09e835d 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
@@ -212,6 +212,7 @@ struct boss_lady_vashj : public BossAI
         _Reset();
 
         me->SetCorpseDelay(1000*60*60);
+        me->SetCanMelee(true);
     }
 
     // Called when a tainted elemental dies
@@ -380,6 +381,7 @@ struct boss_lady_vashj : public BossAI
                 {
                     // Phase 2 begins when Vashj hits 70%. She will run to the middle of her platform and surround herself in a shield making her invulerable.
                     Phase = 2;
+                    me->SetCanMelee(false);
 
                     me->GetMotionMaster()->Clear();
                     DoTeleportTo(MIDDLE_X, MIDDLE_Y, MIDDLE_Z);
@@ -413,9 +415,6 @@ struct boss_lady_vashj : public BossAI
                 } else SummonSporebatTimer -= diff;
             }
 
-            // Melee attack
-            DoMeleeAttackIfReady();
-
             // CheckTimer - used to check if somebody is in melee range
             if (CheckTimer <= diff)
             {
@@ -517,6 +516,8 @@ struct boss_lady_vashj : public BossAI
 
                     me->RemoveAurasDueToSpell(SPELL_MAGIC_BARRIER);
 
+                    me->SetCanMelee(true);
+
                     Talk(SAY_PHASE3);
 
                     Phase = 3;
@@ -682,7 +683,6 @@ struct npc_toxic_sporebat : public ScriptedAI
     {
         Initialize();
         instance = creature->GetInstanceScript();
-        EnterEvadeMode();
     }
 
     void Initialize()
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
index 10bdf3bc631..4db5d93b6e6 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
@@ -166,8 +166,6 @@ struct npc_inner_demon : public ScriptedAI
             DoCastVictim(SPELL_SHADOWBOLT, false);
             ShadowBolt_Timer = 10000;
         } else ShadowBolt_Timer -= diff;
-
-       DoMeleeAttackIfReady();
     }
 };
 
@@ -229,6 +227,7 @@ struct boss_leotheras_the_blind : public BossAI
         me->SetDisplayId(MODEL_NIGHTELF);
         me->SetVirtualItem(0, 0);
         me->SetVirtualItem(1, 0);
+        me->SetCanMelee(true);
         DoCast(me, SPELL_DUAL_WIELD, true);
         me->SetCorpseDelay(1000*60*60);
         _Reset();
@@ -472,12 +471,12 @@ struct boss_leotheras_the_blind : public BossAI
                     Talk(SAY_SWITCH_TO_DEMON);
                     me->SetVirtualItem(0, 0);
                     me->SetVirtualItem(1, 0);
+                    me->SetCanMelee(false);
                     DemonForm = true;
                     NeedThreatReset = true;
                     SwitchToDemon_Timer = 45000;
                 } else SwitchToDemon_Timer -= diff;
             }
-            DoMeleeAttackIfReady();
         }
         else
         {
@@ -543,6 +542,7 @@ struct boss_leotheras_the_blind : public BossAI
                 //switch to nightelf form
                 me->SetDisplayId(MODEL_NIGHTELF);
                 me->LoadEquipment();
+                me->SetCanMelee(true);
 
                 CastConsumingMadness();
                 DespawnDemon();
@@ -757,7 +757,6 @@ struct npc_greyheart_spellbinder : public ScriptedAI
             }
             Earthshock_Timer = urand(8000, 15000);
         } else Earthshock_Timer -= diff;
-        DoMeleeAttackIfReady();
     }
 };
 
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
index 76666bd0141..a89ec5c1ec0 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
@@ -140,6 +140,7 @@ struct boss_the_lurker_below : public BossAI
         me->SetVisible(false); // we start invis under water, submerged
         me->SetUninteractible(true);
         me->SetImmuneToPC(true);
+        me->SetCanMelee(true);
     }
 
     void JustDied(Unit* /*killer*/) override
@@ -175,6 +176,7 @@ struct boss_the_lurker_below : public BossAI
                 if (Submerged)
                 {
                     me->SetVisible(true);
+                    me->SetCanMelee(true);
                     Submerged = false;
                     WaitTimer2 = 500;
                 }
@@ -213,6 +215,7 @@ struct boss_the_lurker_below : public BossAI
             if (PhaseTimer <= diff)
             {
                 me->InterruptNonMeleeSpells(false);
+                me->SetCanMelee(false);
                 DoCast(me, SPELL_SUBMERGE);
                 PhaseTimer = 60000; // 60secs submerged
                 Submerged = true;
@@ -311,9 +314,6 @@ struct boss_the_lurker_below : public BossAI
 
             if (!UpdateVictim())
                 return;
-
-            DoMeleeAttackIfReady();
-
         }
         else // submerged
         {
@@ -324,6 +324,7 @@ struct boss_the_lurker_below : public BossAI
                 me->RemoveAllAuras();
                 me->SetImmuneToPC(false);
                 me->SetEmoteState(EMOTE_ONESHOT_NONE);
+                me->SetCanMelee(true);
                 DoCast(me, SPELL_EMERGE, true);
                 Spawned = false;
                 SpoutTimer = 3000; // directly cast Spout after emerging!
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
index f3273232950..24ee3e052b0 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
@@ -266,8 +266,6 @@ struct boss_morogrim_tidewalker : public BossAI
                 WateryGlobules_Timer = 25000;
             } else WateryGlobules_Timer -= diff;
         }
-
-        DoMeleeAttackIfReady();
     }
 };
 
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
index ce61bc7e4bc..20e0ec3acf9 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
@@ -165,8 +165,6 @@ class npc_coilfang_waterelemental : public CreatureScript
                             break;
                     }
                 }
-
-                DoMeleeAttackIfReady();
             }
 
         private:
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
index c28fab71823..b338d95da56 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
@@ -184,8 +184,6 @@ public:
                     Summon25 = true;
                 }
             }
-
-            DoMeleeAttackIfReady();
         }
     };
 
@@ -264,8 +262,6 @@ public:
 
             if (!UpdateVictim())
                 return;
-
-            DoMeleeAttackIfReady();
         }
     };
 
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
index a964059daf0..f48f1c5c4f1 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
@@ -195,8 +195,6 @@ public:
 
                 Impale_Timer = 7500 + rand32() % 5000;
             } else Impale_Timer -= diff;
-
-            DoMeleeAttackIfReady();
         }
     };
 };
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp
index 715472ca760..0cfddfccd73 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp
@@ -122,8 +122,6 @@ struct boss_mennu_the_betrayer : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 };
 
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp
index 197d2a73332..81d8c350087 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp
@@ -105,8 +105,6 @@ struct boss_quagmirran : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 };
 
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp
index 45768c64463..90e4592ae8f 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp
@@ -113,8 +113,6 @@ struct boss_rokmar_the_crackler : public BossAI
             DoCast(me, SPELL_FRENZY);
             rokmarFrenzy = true;
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp
index 916783f03e3..9bea2aba958 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp
@@ -89,10 +89,7 @@ struct boss_hungarfen : public BossAI
         if (!UpdateVictim())
             return;
 
-        _scheduler.Update(diff, [this]
-        {
-            DoMeleeAttackIfReady();
-        });
+        _scheduler.Update(diff);
 
         if (!HealthAbovePct(20) && !_roared)
         {
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp
index 3aa3f7c4541..14542c3a1dd 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp
@@ -133,8 +133,6 @@ struct boss_the_black_stalker : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 
     void WaypointReached(uint32 waypointId, uint32 pathId) override
diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
index d2a3aaa3ed6..8dfa2b32769 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
@@ -257,8 +257,6 @@ class boss_gruul : public CreatureScript
                     }
                     else
                         m_uiGroundSlamTimer -= diff;
-
-                    DoMeleeAttackIfReady();
                 }
             }
         };
diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
index 78c3e190c50..ea41b09f83c 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
@@ -195,8 +195,6 @@ public:
                     Roar_Timer = 40000 + (rand32() % 10000);
                 } else Roar_Timer -= diff;
             }
-
-            DoMeleeAttackIfReady();
         }
     };
 
@@ -294,8 +292,6 @@ public:
                     DoCast(target, SPELL_DEATH_COIL);
                 DeathCoil_Timer = 20000;
             } else DeathCoil_Timer -= diff;
-
-            DoMeleeAttackIfReady();
         }
     };
 
@@ -389,8 +385,6 @@ public:
                 DoCastVictim(SPELL_ARCANE_EXPLOSION);
                 ArcaneExplosion_Timer = 30000;
             } else ArcaneExplosion_Timer -= diff;
-
-            DoMeleeAttackIfReady();
         }
     };
 
@@ -472,8 +466,6 @@ public:
                 DoCast(me, SPELL_PRAYER_OH);
                 PrayerofHealing_Timer = urand(35000, 50000);
             } else PrayerofHealing_Timer -= diff;
-
-            DoMeleeAttackIfReady();
         }
     };
 
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
index 2c281a65d43..c656675f034 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
@@ -194,8 +194,6 @@ struct BroggokPrisionersAI : public ScriptedAI
 
         if (!UpdateVictim())
             return;
-
-        DoMeleeAttackIfReady();
     }
 
 protected:
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
index 5cd96d0a79b..ffc293cc209 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
@@ -244,8 +244,6 @@ class boss_kelidan_the_breaker : public CreatureScript
                 }
                 else
                     BurningNova_Timer -=diff;
-
-                DoMeleeAttackIfReady();
             }
         };
 
@@ -356,8 +354,6 @@ class npc_shadowmoon_channeler : public CreatureScript
                 }
                 else
                     ShadowBolt_Timer -=diff;
-
-                DoMeleeAttackIfReady();
             }
         };
 
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
index 266cd8dfbee..b51703267d0 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
@@ -211,8 +211,6 @@ class boss_omor_the_unscarred : public CreatureScript
                 }
                 else
                     Shadowbolt_Timer -= diff;
-
-                DoMeleeAttackIfReady();
             }
 
             private:
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
index 02f5fb96ccd..09cb9d4b9e6 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
@@ -182,8 +182,6 @@ class boss_nazan : public CreatureScript
                         else
                             BellowingRoar_Timer -= diff;
                     }
-
-                    DoMeleeAttackIfReady();
                 }
             }
 
@@ -273,8 +271,6 @@ class boss_vazruden : public CreatureScript
                 }
                 else
                     Revenge_Timer -= diff;
-
-                DoMeleeAttackIfReady();
             }
 
             private:
@@ -515,8 +511,6 @@ class npc_hellfire_sentry : public CreatureScript
                 }
                 else
                     KidneyShot_Timer -= diff;
-
-                DoMeleeAttackIfReady();
             }
 
             private:
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
index 778855df653..a2e73cc357a 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
@@ -162,8 +162,6 @@ class boss_watchkeeper_gargolmar : public CreatureScript
                         yelledForHeal = true;
                     }
                 }
-
-                DoMeleeAttackIfReady();
             }
 
             private:
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
index b6f9ffbc92d..1ca650aefd9 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -290,8 +290,6 @@ struct boss_magtheridon : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
@@ -399,8 +397,6 @@ struct npc_hellfire_channeler : public ScriptedAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
index 24529fbef8a..3d190ef247a 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -111,6 +111,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
             {
                 _Reset();
                 me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
+                me->SetCanMelee(true);
 
                 Initialize();
             }
@@ -273,9 +274,10 @@ class boss_grand_warlock_nethekurse : public CreatureScript
                         DeathCoil_Timer -= diff;
 
                     if (!HealthAbovePct(20))
+                    {
                         Phase = true;
-
-                    DoMeleeAttackIfReady();
+                        me->SetCanMelee(false);
+                    }
                 }
             }
 
@@ -353,8 +355,6 @@ class npc_fel_orc_convert : public CreatureScript
                     DoCastVictim(SPELL_HEMORRHAGE);
                     events.ScheduleEvent(EVENT_HEMORRHAGE, 15s);
                 }
-
-                DoMeleeAttackIfReady();
             }
 
             private:
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
index 45d8f4d7852..854f8ec4eb7 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
@@ -367,8 +367,6 @@ class boss_warbringer_omrogg : public CreatureScript
                 }
                 else
                     ThunderClap_Timer -= diff;
-
-                DoMeleeAttackIfReady();
             }
 
             private:
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
index eced2630e10..c8c63e92cb3 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
@@ -299,8 +299,6 @@ class boss_warchief_kargath_bladefist : public CreatureScript
                     }
                     else
                         Summon_Assistant_Timer -= diff;
-
-                    DoMeleeAttackIfReady();
                 }
 
                 if (resetcheck_timer <= diff)
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
index 3fca93a1a44..027dcc85260 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
@@ -170,8 +170,6 @@ class boss_shattered_executioner : public CreatureScript
                 }
                 else
                     cleaveTimer -= diff;
-
-                DoMeleeAttackIfReady();
             }
         private:
             uint32 cleaveTimer;
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index aa42fe49dfa..26e5071f66f 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -442,19 +442,9 @@ struct boss_alar : public BossAI
                 FlamePatch_Timer -= diff;
         }
 
-        DoMeleeAttackIfReady();
-    }
-
-    void DoMeleeAttackIfReady()
-    {
         if (me->isAttackReady() && !me->IsNonMeleeSpellCast(false))
         {
-            if (me->IsWithinMeleeRange(me->GetVictim()))
-            {
-                me->AttackerStateUpdate(me->GetVictim());
-                me->resetAttackTimer();
-            }
-            else
+            if (!me->IsWithinMeleeRange(me->GetVictim()))
             {
                 if (Unit* target = me->SelectNearestTargetInAttackDistance(5))
                     AttackStart(target);
@@ -533,8 +523,6 @@ struct npc_ember_of_alar : public ScriptedAI
             me->KillSelf();
             //me->SetVisibility(VISIBILITY_OFF);
         }
-
-        DoMeleeAttackIfReady();
     }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index 806d379c0fc..4ae564a5b3c 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -395,8 +395,6 @@ struct boss_high_astromancer_solarian : public BossAI
             me->SetArmor(WV_ARMOR, 0);
             me->SetDisplayId(MODEL_VOIDWALKER);
         }
-
-        DoMeleeAttackIfReady();
     }
 };
 
@@ -470,8 +468,6 @@ struct npc_solarium_priest : public ScriptedAI
         }
         else
             aoesilenceTimer -= diff;
-
-        DoMeleeAttackIfReady();
     }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index 4a9c11101c7..eb7c25db955 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -745,9 +745,6 @@ struct boss_kaelthas : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING) && !me->FindCurrentSpellBySpellId(SPELL_KAEL_GAINING_POWER) && !me->FindCurrentSpellBySpellId(SPELL_KAEL_STUNNED))
                 return;
         }
-
-        if (events.IsInPhase(PHASE_COMBAT))
-            DoMeleeAttackIfReady();
     }
 private:
     uint8 _advisorCounter;
@@ -966,8 +963,6 @@ struct boss_thaladred_the_darkener : public advisorbase_ai
         }
         else
             PsychicBlow_Timer -= diff;
-
-        DoMeleeAttackIfReady();
     }
 };
 
@@ -1019,8 +1014,6 @@ struct boss_lord_sanguinar : public advisorbase_ai
         }
         else
             Fear_Timer -= diff;
-
-        DoMeleeAttackIfReady();
     }
 };
 
@@ -1202,8 +1195,6 @@ struct boss_master_engineer_telonicus : public advisorbase_ai
         }
         else
             RemoteToy_Timer -= diff;
-
-        DoMeleeAttackIfReady();
     }
 };
 
@@ -1265,8 +1256,6 @@ struct npc_phoenix_tk : public ScriptedAI
         }
         else
             Cycle_Timer -= diff;
-
-        DoMeleeAttackIfReady();
     }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
index b15e165bbe2..75d03ce798d 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
@@ -139,8 +139,6 @@ struct boss_void_reaver : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
index 1697cf13df2..a4af7fc1d50 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
@@ -108,8 +108,6 @@ struct boss_gatewatcher_gyrokill : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
index 8d09645b02a..770ce2090e8 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
@@ -114,8 +114,6 @@ struct boss_gatewatcher_iron_hand : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
index cc13773a290..1da49ecd87f 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
@@ -152,8 +152,6 @@ struct boss_mechano_lord_capacitus : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
index 3ca064382e3..9d4325e080d 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -134,8 +134,6 @@ struct boss_nethermancer_sepethrea : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 };
 
@@ -193,8 +191,6 @@ struct npc_raging_flames : public ScriptedAI
             return;
 
         _scheduler.Update(diff);
-
-        DoMeleeAttackIfReady();
     }
 
 private:
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
index 11dbd778ab8..779a8a411da 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
@@ -151,8 +151,6 @@ struct boss_pathaleon_the_calculator : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 };
 
@@ -220,7 +218,6 @@ struct npc_nether_wraith : public ScriptedAI
             else
                 Die_Timer -= diff;
         }
-        DoMeleeAttackIfReady();
     }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
index 765d655a6c9..d8b433b8c3b 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -212,8 +212,6 @@ struct npc_millhouse_manastorm : public ScriptedAI
         }
         else
             Fireball_Timer -=diff;
-
-        DoMeleeAttackIfReady();
     }
 };
 /*#####
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
index d445cd2b7e8..cc988250d5d 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
@@ -178,8 +178,6 @@ struct boss_dalliah_the_doomsayer : public BossAI
                 soccothrates->AI()->Talk(SAY_DALLIAH_25_PERCENT);
             soccothratesTaunt = true;
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
index 62aec2b0374..69d58090969 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
@@ -263,7 +263,6 @@ struct boss_harbinger_skyriss : public BossAI
             else
                 ManaBurn_Timer -=diff;
         }
-        DoMeleeAttackIfReady();
     }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
index ab0c7473639..ba95dd2eb50 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
@@ -271,8 +271,6 @@ struct boss_wrath_scryer_soccothrates : public BossAI
                 dalliah->AI()->Talk(SAY_SOCCOTHRATES_25_PERCENT);
             dalliahTaunt = true;
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
index 9c27ae56381..07530c273af 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
@@ -106,8 +106,6 @@ struct boss_zereketh_the_unbound : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
index 896df533363..3cb7030f1bd 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
@@ -143,8 +143,6 @@ struct boss_commander_sarannis : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
index aedc8509b6e..3fa2617f90b 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
@@ -138,8 +138,6 @@ struct boss_high_botanist_freywinn : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
index 833df956b12..53ecf51cdfc 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
@@ -140,8 +140,6 @@ struct boss_laj : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
index 1af1d6c10cd..ce4d2100ce5 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
@@ -147,8 +147,6 @@ class boss_thorngrin_the_tender : public CreatureScript
                     if (me->HasUnitState(UNIT_STATE_CASTING))
                         return;
                 }
-
-                DoMeleeAttackIfReady();
             }
 
         private:
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
index e4672be695a..65ee3e6d241 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
@@ -137,8 +137,6 @@ struct boss_warp_splinter : public BossAI
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
         }
-
-        DoMeleeAttackIfReady();
     }
 };
 
@@ -161,14 +159,6 @@ struct npc_warp_splinter_sapling : public ScriptedAI
             me->DespawnOrUnsummon(2s);
         }
     }
-
-    void UpdateAI(uint32 /*diff*/) override
-    {
-        if (!UpdateVictim())
-            return;
-
-        DoMeleeAttackIfReady();
-    }
 };
 
 void AddSC_boss_warp_splinter()
diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
index 9d1a56f7dec..769f441e04b 100644
--- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
+++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
@@ -155,8 +155,6 @@ struct boss_doomlord_kazzak : public ScriptedAI
                     break;
             }
         }
-
-        DoMeleeAttackIfReady();
     }
 
 private:
diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp
index f9b48263ba7..392bc3d5451 100644
--- a/src/server/scripts/Outland/boss_doomwalker.cpp
+++ b/src/server/scripts/Outland/boss_doomwalker.cpp
@@ -151,7 +151,6 @@ struct boss_doomwalker : public ScriptedAI
                     break;
             }
         }
-        DoMeleeAttackIfReady();
     }
 
     private:
diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
index 5b66e7e43cc..729dce5cda6 100644
--- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
@@ -219,8 +219,6 @@ public:
                 DoCastVictim(SPELL_ARCANE_BLAST);
                 ArcaneBlast_Timer = 2500 + rand32() % 5000;
             } else ArcaneBlast_Timer -= diff;
-
-            DoMeleeAttackIfReady();
         }
     };
 
diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
index 3766425e621..beeb737ebf6 100644
--- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
@@ -610,8 +610,6 @@ public:
 
             if (!UpdateVictim())
                 return;
-
-            DoMeleeAttackIfReady();
         }
 
         bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override
@@ -693,8 +691,6 @@ struct npc_watch_commander_leonus : public ScriptedAI
 
         if (!UpdateVictim())
             return;
-
-        DoMeleeAttackIfReady();
     }
 
 private:
diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp
index c13395e9adc..fbebecf1b67 100644
--- a/src/server/scripts/Outland/zone_nagrand.cpp
+++ b/src/server/scripts/Outland/zone_nagrand.cpp
@@ -197,8 +197,6 @@ public:
             }
             else
                 FrostShockTimer -= diff;
-
-            DoMeleeAttackIfReady();
         }
 
         void OnQuestAccept(Player* player, Quest const* quest) override
@@ -392,8 +390,6 @@ public:
                 DoCastVictim(SPELL_KUR_FROST_SHOCK);
                 FrostShockTimer = urand(7500, 15000);
             } else FrostShockTimer -= diff;
-
-            DoMeleeAttackIfReady();
         }
 
         void OnQuestAccept(Player* player, Quest const* quest) override
@@ -465,10 +461,7 @@ public:
             if (!UpdateVictim())
                 return;
 
-            scheduler.Update(diff, [this]
-            {
-                DoMeleeAttackIfReady();
-            });
+            scheduler.Update(diff);
         }
 
         bool IsBannered()
@@ -544,10 +537,7 @@ public:
                 interrupt_cooldown = 0;
             }
 
-            scheduler.Update(diff, [this]
-            {
-                DoMeleeAttackIfReady();
-            });
+            scheduler.Update(diff);
         }
 
         void DamageTaken(Unit* /*attacker*/, uint32& damage, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override
diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp
index 631be8101ac..a895d7b345b 100644
--- a/src/server/scripts/Outland/zone_netherstorm.cpp
+++ b/src/server/scripts/Outland/zone_netherstorm.cpp
@@ -454,8 +454,6 @@ public:
                     me->SetInCombatWith(player);
                 }
             } // end: support for quest 10190
-
-            DoMeleeAttackIfReady();
         }
     };
 };
diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
index 3d849c5ce95..b61e5cf87bf 100644
--- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
@@ -177,14 +177,6 @@ public:
             }
         }
 
-        void UpdateAI(uint32 /*diff*/) override
-        {
-            if (!UpdateVictim())
-                return;
-
-            DoMeleeAttackIfReady();
-        }
-
     private:
         ObjectGuid casterGUID;
     };
@@ -333,8 +325,6 @@ public:
             }
             else
                 CastTimer -= diff;
-
-            DoMeleeAttackIfReady();
         }
     };
 };
@@ -454,8 +444,6 @@ public:
                 }
                 return;
             }
-
-            DoMeleeAttackIfReady();
         }
 
     private:
@@ -876,8 +864,6 @@ public:
                     SpellTimer3 = SpawnCast[8].Timer2 + (rand32() % 7 * 1000);//Spell Reflection
                 } else SpellTimer3 -= diff;
             }
-
-            DoMeleeAttackIfReady();
         }
 
         void JustDied(Unit* killer) override
@@ -1179,8 +1165,6 @@ public:
                     SpellTimer2 = SpawnCast[5].Timer2 + (rand32() % 7 * 13000);
                 } else SpellTimer2 -= diff;
             }
-
-            DoMeleeAttackIfReady();
         }
     };
 };
@@ -1433,11 +1417,9 @@ public:
                 }
             }
 
-        if (me->GetEntry() == NPC_ENRAGED_FIRE_SPIRIT || me->GetEntry() == NPC_ENRAGED_AIR_SPIRIT)
-            if (HealthBelowPct(35) && !me->GetAura(SPELL_ENRAGE))
-                DoCastSelf(SPELL_ENRAGE);
-
-        DoMeleeAttackIfReady();
+            if (me->GetEntry() == NPC_ENRAGED_FIRE_SPIRIT || me->GetEntry() == NPC_ENRAGED_AIR_SPIRIT)
+                if (HealthBelowPct(35) && !me->GetAura(SPELL_ENRAGE))
+                    DoCastSelf(SPELL_ENRAGE);
         }
 
         void JustDied(Unit* /*killer*/) override
diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp
index 41e4b00661a..d17045509d5 100644
--- a/src/server/scripts/Outland/zone_terokkar_forest.cpp
+++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp
@@ -142,8 +142,6 @@ public:
                 DoCast(me, SPELL_PULVERIZE);
                 Pulverize_Timer = 9000;
             } else Pulverize_Timer -= diff;
-
-            DoMeleeAttackIfReady();
         }
     };
 };