Core/Creatures: Moved autoattack handling from scripts to game

2 files changed, 1 insertions, 10 deletions

diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
index c38fef91072..db0c2164857 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
@@ -202,8 +202,6 @@ class boss_archaedas : public CreatureScript
                     //45 seconds until we should cast this agian
                     uiTremorTimer  = 45000;
                 } else uiTremorTimer  -= uiDiff;
-
-                DoMeleeAttackIfReady();
             }
 
             void JustDied (Unit* /*killer*/) override
@@ -314,8 +312,6 @@ class npc_archaedas_minions : public CreatureScript
                 //Return since we have no target
                 if (!UpdateVictim())
                     return;
-
-                DoMeleeAttackIfReady();
             }
         };
 
@@ -371,8 +367,6 @@ class npc_stonekeepers : public CreatureScript
                 //Return since we have no target
                 if (!UpdateVictim())
                     return;
-
-                DoMeleeAttackIfReady();
             }
 
             void JustDied(Unit* /*killer*/) override
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
index e1c15c7bdf7..bdacd1ba34c 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
@@ -83,10 +83,7 @@ struct boss_ironaya : public BossAI
         if (!UpdateVictim())
             return;
 
-        scheduler.Update(diff, [this]
-        {
-            DoMeleeAttackIfReady();
-        });
+        scheduler.Update(diff);
     }
 
 private: