Core/Creatures: Moved autoattack handling from scripts to game

3 files changed, 2 insertions, 12 deletions

diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp
index 4e7bee33cb8..351436f7f1a 100644
--- a/src/server/scripts/World/boss_emerald_dragons.cpp
+++ b/src/server/scripts/World/boss_emerald_dragons.cpp
@@ -156,8 +156,6 @@ struct emerald_dragonAI : public WorldBossAI
 
         if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, -50.0f, true))
             DoCast(target, SPELL_SUMMON_PLAYER);
-
-        DoMeleeAttackIfReady();
     }
 };
 
diff --git a/src/server/scripts/World/npc_guard.cpp b/src/server/scripts/World/npc_guard.cpp
index 879fef3e95e..cfbb8be671a 100644
--- a/src/server/scripts/World/npc_guard.cpp
+++ b/src/server/scripts/World/npc_guard.cpp
@@ -129,12 +129,8 @@ struct npc_guard_generic : public GuardAI
                 {
                     me->resetAttackTimer();
                     DoCastVictim(spellInfo->Id);
-                    meleeContext.Repeat();
-                    return;
                 }
             }
-            me->AttackerStateUpdate(victim);
-            me->resetAttackTimer();
             meleeContext.Repeat();
         }).Schedule(Seconds(5), [this](TaskContext spellContext)
         {
@@ -205,10 +201,7 @@ struct npc_guard_shattrath_faction : public GuardAI
         if (!UpdateVictim())
             return;
 
-        _scheduler.Update(diff, [this]
-        {
-            DoMeleeAttackIfReady();
-        });
+        _scheduler.Update(diff);
     }
 
     void ScheduleVanish()
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index 25d8237f808..afefcc42ba9 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -251,8 +251,7 @@ public:
                     ResetFlagTimer -= diff;
             }
 
-            if (UpdateVictim())
-                DoMeleeAttackIfReady();
+            UpdateVictim();
         }
 
         void ReceiveEmote(Player* player, uint32 emote) override