Merge pull request #9761 from xjose93/ImproveLog11

Core/Logs: Added functions GetMapAreaAndZoneString() and GetCoordsMapAreaAndZoneString()

2 files changed, 28 insertions, 0 deletions

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 8f1669910e7..b8d43580590 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -26261,6 +26261,31 @@ float Player::GetCollisionHeight(bool mounted) const
     }
 }
 
+std::string Player::GetMapAreaAndZoneString()
+{
+    uint32 areaId = GetAreaId();
+    std::string areaName = "Unknown";
+    std::string zoneName = "Unknown";
+    if (AreaTableEntry const* area = GetAreaEntryByAreaID(areaId))
+    {
+        int locale = GetSession()->GetSessionDbcLocale();
+        areaName = area->area_name[locale];
+        if (AreaTableEntry const* zone = GetAreaEntryByAreaID(area->zone))
+            zoneName = zone->area_name[locale];
+    }
+
+    std::ostringstream str;
+    str << "Map: " << GetMapId() << " (" << (FindMap() ? FindMap()->GetMapName() : "Unknown") << ") Area: " << areaId << " (" << areaName.c_str() << ") Zone: " << zoneName.c_str();
+    return str.str();
+}
+
+std::string Player::GetCoordsMapAreaAndZoneString()
+{
+    std::ostringstream str;
+    str << Position::ToString() << " " << GetMapAreaAndZoneString();
+    return str.str();
+}
+
 Guild* Player::GetGuild()
 {
     uint32 guildId = GetGuildId();
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 7500755a101..550a48bfe8a 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -2291,6 +2291,9 @@ class Player : public Unit, public GridObject<Player>
         //! Return collision height sent to client
         float GetCollisionHeight(bool mounted) const;
 
+        std::string GetMapAreaAndZoneString();
+        std::string GetCoordsMapAreaAndZoneString();
+
     protected:
         // Gamemaster whisper whitelist
         WhisperListContainer WhisperList;