Core/Creatures: Moved autoattack handling from scripts to game

10 files changed, 4 insertions, 30 deletions

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;