fix(Core/Scripts): Fix build and crash when calling uninitialized scr…

…ipts (azerothcore#18718) fix(Core/Scripts): Fix build and crash when calling uninitialized scripts.
AthenaSui · Apr 12, 2024 · 3a6231c · 3a6231c
1 parent f05200f
commit 3a6231c
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 1 deletion.
diff --git a/src/server/game/Scripting/ScriptDefines/AccountScript.h b/src/server/game/Scripting/ScriptDefines/AccountScript.h
@@ -19,6 +19,7 @@
 #define SCRIPT_OBJECT_ACCOUNT_SCRIPT_H_
 
 #include "ScriptObject.h"
+#include <vector>
 
 enum AccountHook
 {

diff --git a/src/server/game/Scripting/ScriptDefines/ArenaScript.h b/src/server/game/Scripting/ScriptDefines/ArenaScript.h
@@ -20,6 +20,7 @@
 
 #include "ObjectGuid.h"
 #include "ScriptObject.h"
+#include <vector>
 
 enum ArenaHook
 {

diff --git a/src/server/game/Scripting/ScriptDefines/ArenaTeamScript.h b/src/server/game/Scripting/ScriptDefines/ArenaTeamScript.h
@@ -20,6 +20,7 @@
 
 #include "Battleground.h"
 #include "ScriptObject.h"
+#include <vector>
 
 enum ArenaTeamHook
 {

diff --git a/src/server/game/Scripting/ScriptDefines/AuctionHouseScript.h b/src/server/game/Scripting/ScriptDefines/AuctionHouseScript.h
@@ -19,6 +19,7 @@
 #define SCRIPT_OBJECT_AUCTION_HOUSE_SCRIPT_H_
 
 #include "ScriptObject.h"
+#include <vector>
 
 enum AuctionHouseHook
 {

diff --git a/src/server/game/Scripting/ScriptDefines/MovementHandlerScript.h b/src/server/game/Scripting/ScriptDefines/MovementHandlerScript.h
@@ -20,6 +20,7 @@
 
 #include "Object.h"
 #include "ScriptObject.h"
+#include <vector>
 
 enum MovementHook
 {

diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
@@ -77,6 +77,12 @@ void ScriptMgr::Initialize()
 
     _script_loader_callback();
     _modules_loader_callback();
+
+    ScriptRegistry<PlayerScript>::InitEnabledHooksIfNeeded(PLAYERHOOK_END);
+    ScriptRegistry<AuctionHouseScript>::InitEnabledHooksIfNeeded(AUCTIONHOUSEHOOK_END);
+    ScriptRegistry<ArenaTeamScript>::InitEnabledHooksIfNeeded(ARENATEAMHOOK_END);
+    ScriptRegistry<ArenaScript>::InitEnabledHooksIfNeeded(ARENAHOOK_END);
+    ScriptRegistry<MovementHandlerScript>::InitEnabledHooksIfNeeded(MOVEMENTHOOK_END);
 }
 
 void ScriptMgr::Unload()

diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
@@ -725,6 +725,11 @@ class ScriptRegistry
     // With this approach, we wouldn't call all available hooks in case if we override just one hook.
     static EnabledHooksVector EnabledHooks;
 
+    static void InitEnabledHooksIfNeeded(uint16 totalAvailableHooks)
+    {
+        EnabledHooks.resize(totalAvailableHooks);
+    }
+
     static void AddScript(TScript* const script, std::vector<uint16> enabledHooks = {})
     {
         ASSERT(script);
@@ -733,7 +738,7 @@ class ScriptRegistry
             return;
 
         if (EnabledHooks.empty())
-            EnabledHooks.resize(script->GetTotalAvailableHooks());
+            InitEnabledHooksIfNeeded(script->GetTotalAvailableHooks());
 
         if (script->isAfterLoadScript())
         {