Core/Movement: Include GetGameClientMovingMe() details in assert logs

3 files changed, 11 insertions, 1 deletions

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index eef6eac817a..24896ab1560 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -13676,6 +13676,7 @@ std::string Unit::GetDebugInfo() const
         << "" << (movespline ? movespline->ToString() : "Movespline: <none>\n")
         << "GetCharmedGUID(): " << GetCharmedGUID().ToString() << "\n"
         << "GetCharmerGUID(): " << GetCharmerGUID().ToString() << "\n"
-        << "" << (GetVehicleKit() ? GetVehicleKit()->GetDebugInfo() : "No vehicle kit");
+        << "" << (GetVehicleKit() ? GetVehicleKit()->GetDebugInfo() : "No vehicle kit") << "\n"
+        << "GetGameClientMovingMe(): " << (GetGameClientMovingMe() ? GetGameClientMovingMe()->GetDebugInfo() : "NULL");
     return sstr.str();
 }
diff --git a/src/server/game/Server/GameClient.cpp b/src/server/game/Server/GameClient.cpp
index d75ee938a4f..454e96ed274 100644
--- a/src/server/game/Server/GameClient.cpp
+++ b/src/server/game/Server/GameClient.cpp
@@ -67,3 +67,10 @@ void GameClient::SendDirectMessage(WorldPacket const* data) const
 {
     GetBasePlayer()->SendDirectMessage(data);
 }
+
+std::string GameClient::GetDebugInfo() const
+{
+    std::stringstream sstr;
+    sstr << "GetBasePlayer(): " << (GetBasePlayer() ? GetBasePlayer()->GetGUID().ToString().c_str() : "NULL");
+    return sstr.str();
+}
diff --git a/src/server/game/Server/GameClient.h b/src/server/game/Server/GameClient.h
index d44f1625718..ba2fec7311a 100644
--- a/src/server/game/Server/GameClient.h
+++ b/src/server/game/Server/GameClient.h
@@ -41,6 +41,8 @@ class TC_GAME_API GameClient
         WorldSession* GetWorldSession() const { return _sessionToServer; }
 
         void SendDirectMessage(WorldPacket const* data) const;
+
+        std::string GetDebugInfo() const;
     private:
         // describe all units that this client has direct control over. Example, a player on a vehicle has client control over himself and the vehicle at the same time.
         GuidUnorderedSet _allowedMovers;