Merge branch 'master' into Playerbot

src/server/game/Server/Packet.cpp

@@ -22,7 +22,7 @@ WorldPackets::Packet::Packet(WorldPacket&& worldPacket) : _worldPacket(std::move
 {
 }
 
-WorldPackets::ServerPacket::ServerPacket(OpcodeServer opcode, size_t initialSize /*= 200*/) : Packet(WorldPacket(opcode, initialSize))
+WorldPackets::ServerPacket::ServerPacket(OpcodeServer opcode, std::size_t initialSize /*= 200*/) : Packet(WorldPacket(opcode, initialSize))
 {
 }
 

src/server/game/Server/Packet.h

@@ -36,7 +36,7 @@ namespace WorldPackets
         virtual void Read() = 0;
 
         [[nodiscard]] WorldPacket const* GetRawPacket() const { return &_worldPacket; }
-        [[nodiscard]] size_t GetSize() const { return _worldPacket.size(); }
+        [[nodiscard]] std::size_t GetSize() const { return _worldPacket.size(); }
 
     protected:
         WorldPacket _worldPacket;
@@ -45,7 +45,7 @@ namespace WorldPackets
     class AC_GAME_API ServerPacket : public Packet
     {
     public:
-        ServerPacket(OpcodeServer opcode, size_t initialSize = 200);
+        ServerPacket(OpcodeServer opcode, std::size_t initialSize = 200);
 
         void Read() final;
 

src/server/game/Server/WorldPacket.h

@@ -29,7 +29,7 @@ public:
     // just container for later use
     WorldPacket() : ByteBuffer(0) { }
 
-    explicit WorldPacket(uint16 opcode, size_t res = 200) :
+    explicit WorldPacket(uint16 opcode, std::size_t res = 200) :
         ByteBuffer(res), m_opcode(opcode) { }
 
     WorldPacket(WorldPacket&& packet) noexcept :
@@ -66,7 +66,7 @@ public:
     WorldPacket(uint16 opcode, MessageBuffer&& buffer) :
         ByteBuffer(std::move(buffer)), m_opcode(opcode) { }
 
-    void Initialize(uint16 opcode, size_t newres = 200)
+    void Initialize(uint16 opcode, std::size_t newres = 200)
     {
         clear();
         _storage.reserve(newres);

src/server/game/Server/WorldSession.cpp

@@ -46,13 +46,14 @@
 #include "Tokenize.h"
 #include "Transport.h"
 #include "Vehicle.h"
-#include "WardenMac.h"
 #include "WardenWin.h"
 #include "World.h"
 #include "WorldPacket.h"
 #include "WorldSocket.h"
 #include <zlib.h>
 
+#include "BanMgr.h"
+
 namespace
 {
     std::string const DefaultPlayerName = "<none>";

src/server/game/Server/WorldSession.h

@@ -25,7 +25,6 @@
 #include "AccountMgr.h"
 #include "AddonMgr.h"
 #include "AuthDefines.h"
-#include "BanMgr.h"
 #include "CircularBuffer.h"
 #include "Common.h"
 #include "DatabaseEnv.h"
@@ -35,6 +34,7 @@
 #include "SharedDefines.h"
 #include "World.h"
 #include <map>
+#include <memory>
 #include <utility>
 
 class Creature;