Merge pull request #14710 from et65/6.x

Core/PacketsIO: Implemented or updated most of party related packets.

1 files changed, 19 insertions, 0 deletions

diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index ac87f58af5c..10288cff927 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -2242,6 +2242,25 @@ bool ObjectMgr::GetPlayerNameByGUID(ObjectGuid const& guid, std::string& name)
     return false;
 }
 
+bool ObjectMgr::GetPlayerNameAndClassByGUID(ObjectGuid const& guid, std::string& name, uint8& _class)
+{
+    if (Player* player = ObjectAccessor::FindConnectedPlayer(guid))
+    {
+        name = player->GetName();
+        _class = player->getClass();
+        return true;
+    }
+
+    if (CharacterInfo const* characterInfo = sWorld->GetCharacterInfo(guid))
+    {
+        name = characterInfo->Name;
+        _class = characterInfo->Class;
+        return true;
+    }
+
+    return false;
+}
+
 uint32 ObjectMgr::GetPlayerTeamByGUID(ObjectGuid const& guid)
 {
     if (Player* player = ObjectAccessor::FindConnectedPlayer(guid))