Merge branch 'master' into Playerbot

2026-01-27 15:46:24 +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/game/Chat/Channels/Channel.h
+++ b/src/server/game/Chat/Channels/Channel.h
@@ -21,10 +21,7 @@
 #include "Common.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include <list>
-#include <map>
 #include <string>
-#include <utility>

 class Player;

--- a/src/server/game/Chat/Channels/ChannelMgr.h
+++ b/src/server/game/Chat/Channels/ChannelMgr.h
@@ -19,7 +19,6 @@
 #define __ACORE_CHANNELMGR_H

 #include "Channel.h"
-#include "Common.h"
 #include "World.h"
 #include <map>
 #include <string>
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@@ -22,7 +22,6 @@
 #include "Player.h"
 #include "SharedDefines.h"
 #include "WorldSession.h"
-#include <vector>

 class ChatHandler;
 class Creature;
--- a/src/server/game/Chat/ChatCommands/ChatCommand.h
+++ b/src/server/game/Chat/ChatCommands/ChatCommand.h
@@ -23,14 +23,12 @@
 #include "Define.h"
 #include "Errors.h"
 #include "Language.h"
-#include "ObjectGuid.h"
 #include "Optional.h"
 #include "StringFormat.h"
 #include "Util.h"
 #include <cstddef>
 #include <map>
 #include <tuple>
-#include <utility>
 #include <variant>
 #include <vector>

--- a/src/server/game/Chat/ChatCommands/ChatCommandArgs.h
+++ b/src/server/game/Chat/ChatCommands/ChatCommandArgs.h
@@ -24,7 +24,6 @@
 #include "StringConvert.h"
 #include "StringFormat.h"
 #include "Util.h"
-#include <charconv>
 #include <map>
 #include <string>
 #include <string_view>