Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp

2 files changed, 6 insertions, 4 deletions

diff --git a/src/server/shared/Networking/MessageBuffer.h b/src/server/shared/Networking/MessageBuffer.h
index 547b39130a4..c7f8ba31a71 100644
--- a/src/server/shared/Networking/MessageBuffer.h
+++ b/src/server/shared/Networking/MessageBuffer.h
@@ -40,6 +40,10 @@ public:
 
     bool IsMessageReady() const { return _wpos == _storage.size(); }
 
+    size_type GetSize() const { return _storage.size(); }
+
+    size_type GetReadyDataSize() const { return _wpos; }
+
     size_type GetMissingSize() const { return _storage.size() - _wpos; }
 
     uint8* Data() { return _storage.data(); }
@@ -55,8 +59,6 @@ public:
 
     void ResetWritePointer() { _wpos = 0; }
 
-    size_type GetSize() const { return _storage.size(); }
-
     std::vector<uint8>&& Move()
     {
         _wpos = 0;
diff --git a/src/server/shared/Networking/Socket.h b/src/server/shared/Networking/Socket.h
index dd638c059a5..a13a079ff6c 100644
--- a/src/server/shared/Networking/Socket.h
+++ b/src/server/shared/Networking/Socket.h
@@ -146,8 +146,8 @@ public:
     uint8* GetHeaderBuffer() { return _readHeaderBuffer.Data(); }
     uint8* GetDataBuffer() { return _readDataBuffer.Data(); }
 
-    size_t GetHeaderSize() const { return _readHeaderBuffer.GetSize(); }
-    size_t GetDataSize() const { return _readDataBuffer.GetSize(); }
+    size_t GetHeaderSize() const { return _readHeaderBuffer.GetReadyDataSize(); }
+    size_t GetDataSize() const { return _readDataBuffer.GetReadyDataSize(); }
 
     MessageBuffer&& MoveHeader() { return std::move(_readHeaderBuffer); }
     MessageBuffer&& MoveData() { return std::move(_readDataBuffer); }