Merge branch 'master' into Playerbot

2026-02-05 12:03:48 +00:00 · 2024-11-08 20:58:52 +08:00
parent abd9b4ebb8 6a6b8473a0
commit 545bb18af4
122 changed files with 7571 additions and 1746 deletions
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -19,7 +19,6 @@
 #include "AllScriptsObjects.h"
 #include "InstanceScript.h"
 #include "LFGScripts.h"
-#include "ScriptObject.h"
 #include "ScriptSystem.h"
 #include "SmartAI.h"
 #include "SpellMgr.h"