Merge branch 'master' into Playerbot

2026-02-01 01:53:47 +00:00 · 2024-08-18 23:02:22 +08:00
parent 33e4bc8390 a0689fb4ef
commit 27b243e7b2
50 changed files with 2365 additions and 1344 deletions
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -28,6 +28,7 @@
 #include "BattlegroundAV.h"
 #include "BattlegroundMgr.h"
 #include "CellImpl.h"
+#include "CharmInfo.h"
 #include "Channel.h"
 #include "CharacterCache.h"
 #include "CharacterDatabaseCleaner.h"