Merge branch 'master' into Playerbot

# Conflicts: # src/server/game/Entities/GameObject/GameObject.h
2026-01-25 06:36:24 +00:00 · 2023-02-13 13:07:03 -07:00
parent ccee04c908 fdfa88093e
commit 4bc9901f16
312 changed files with 6400 additions and 4718 deletions
--- a/src/server/game/Scripting/ScriptDefines/BattlegroundScript.cpp
+++ b/src/server/game/Scripting/ScriptDefines/BattlegroundScript.cpp
@@ -19,7 +19,7 @@

 Battleground* ScriptMgr::CreateBattleground(BattlegroundTypeId /*typeId*/)
 {
-    // TODO: Implement script-side battlegrounds.
+    /// @todo: Implement script-side battlegrounds.
    ABORT();
    return nullptr;
 }