From 605e5f94c0d71cad8e83fa5a07eaec4e6bed9cc3 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Mon, 8 Jan 2024 22:23:12 +0100
Subject: Core/Creatures: Moved autoattack handling from scripts to game

---
 src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp            | 4 ----
 src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp | 2 --
 src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp               | 2 --
 src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp            | 2 --
 src/server/scripts/Maelstrom/Stonecore/stonecore.cpp                | 1 +
 5 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'src/server/scripts/Maelstrom')

diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
index 98e2714df17..596d9a397fc 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
@@ -228,8 +228,6 @@ class boss_corborus : public CreatureScript
                             break;
                     }
                 }
-
-                DoMeleeAttackIfReady();
             }
 
             void JustSummoned(Creature* summon) override
@@ -303,8 +301,6 @@ class npc_rock_borer : public CreatureScript
                             break;
                     }
                 }
-
-                DoMeleeAttackIfReady();
             }
 
         private:
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
index 05f40e1cc38..17289d91586 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
@@ -292,8 +292,6 @@ class boss_high_priestess_azil : public CreatureScript
                             break;
                     }
                 }
-
-                DoMeleeAttackIfReady();
             }
 
         private:
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
index c028cd99b47..53ed9b44049 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
@@ -174,8 +174,6 @@ class boss_ozruk : public CreatureScript
                             break;
                     }
                 }
-
-                DoMeleeAttackIfReady();
             }
         };
 
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
index aee7aa6352b..0f1c5552224 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
@@ -284,8 +284,6 @@ class boss_slabhide : public CreatureScript
                             break;
                     }
                 }
-
-                DoMeleeAttackIfReady();
             }
 
         private:
diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
index db0a43b6f8c..8a41d69d973 100644
--- a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
@@ -108,6 +108,7 @@ class npc_sc_millhouse_manastorm : public CreatureScript
                 _instance(creature->GetInstanceScript())
             {
                 events.SetPhase(PHASE_MILLHOUSE_GROUP_1);
+                me->SetCanMelee(false); // DoSpellAttackIfReady
             }
 
             void ScheduleEvents()
-- 
cgit v1.2.3