Merge branch 'master' into Playerbot

2026-01-17 02:50:29 +00:00 · 2024-10-30 21:43:42 +08:00
parent 2e37c1ff1d 752c6875b5
commit abd9b4ebb8
128 changed files with 5812 additions and 1264 deletions
--- a/src/server/database/Database/DatabaseEnv.h
+++ b/src/server/database/Database/DatabaseEnv.h
@@ -31,7 +31,6 @@

 #include "PreparedStatement.h"
 #include "QueryCallback.h"
-#include "QueryResult.h"
 #include "Transaction.h"

 /// Accessor to the world database
--- a/src/server/database/Updater/DBUpdater.h
+++ b/src/server/database/Updater/DBUpdater.h
@@ -20,6 +20,7 @@

 #include "DatabaseEnv.h"
 #include "Define.h"
+#include "QueryResult.h"
 #include <filesystem>
 #include <string>