5 files changed, 24 insertions, 11 deletions
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index d99fa241e..2166205f6 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -1741,26 +1741,23 @@ void BeingRecv::processBeingAttrs(Net::MessageIn &msg)
 
     Being *const dstBeing = actorManager->findBeing(
         msg.readBeingId("player id"));
-    const int gmLevel = msg.readInt32("gm level");
+    const int gmLevel = msg.readInt32("group id");
     uint16_t mount = 0;
     mount = msg.readInt16("mount");
     int language = -1;
-    if (serverVersion >= 17)
+    if (serverVersion >= 17 && len > 14)
         language = msg.readInt16("language");
     if (dstBeing != nullptr)
     {
-        if (gmLevel != 0)
+        if (serverVersion <= 17 &&
+            dstBeing == localPlayer)
         {
-            if (dstBeing == localPlayer)
-                localPlayer->setGMLevel(gmLevel);
-            dstBeing->setGM(true);
+            localPlayer->setGMLevel(gmLevel);
         }
+        if (gmLevel != 0)
+            dstBeing->setGM(true);
         else
-        {
-            if (dstBeing == localPlayer)
-                localPlayer->setGMLevel(0);
             dstBeing->setGM(false);
-        }
         dstBeing->setHorse(mount);
         dstBeing->setLanguageId(language);
         if (dstBeing == localPlayer)
diff --git a/src/net/eathena/network.h b/src/net/eathena/network.h
index d22adaa2b..6ca6a4d56 100644
--- a/src/net/eathena/network.h
+++ b/src/net/eathena/network.h
@@ -29,7 +29,7 @@
  * Protocol version, reported to the eAthena char and mapserver who can adjust
  * the protocol accordingly.
  */
-#define CLIENT_PROTOCOL_VERSION      21
+#define CLIENT_PROTOCOL_VERSION      22
 
 namespace EAthena
 {
diff --git a/src/net/eathena/packetsin.inc b/src/net/eathena/packetsin.inc
index 036c5fde9..41cfa1036 100644
--- a/src/net/eathena/packetsin.inc
+++ b/src/net/eathena/packetsin.inc
@@ -844,6 +844,7 @@ if (serverVersion > 0)
     packet(SMSG_HOMUNCULUS_EXP,            0x0b22,  10, &HomunculusRecv::processHomunculusExp,          0);
     packet(SMSG_QUEST_LIST2,               0x0b23,  -1, &QuestRecv::processAddQuests2,                  0);
     packet(SMSG_QUEST_ADD2,                0x0b24,  23, &QuestRecv::processAddQuest2,                   0);
+    packet(SMSG_PLAYER_ATTRS,              0x0b25,  -1, &PlayerRecv::processPlayerAttrs,                0);
 
     // char server
     packet(SMSG_CHAR_PASSWORD_RESPONSE,    0x0062,   3, &LoginRecv::processCharPasswordResponse,        0);
diff --git a/src/net/eathena/playerrecv.cpp b/src/net/eathena/playerrecv.cpp
index 9eb57b687..d9674a90e 100644
--- a/src/net/eathena/playerrecv.cpp
+++ b/src/net/eathena/playerrecv.cpp
@@ -477,4 +477,18 @@ void PlayerRecv::processKilledBy(Net::MessageIn &msg)
     }
 }
 
+void PlayerRecv::processPlayerAttrs(Net::MessageIn &msg)
+{
+    const int len = msg.readInt16("len");
+    if (len < 8)
+        return;
+
+    const int gmLevel = msg.readInt32("group id");
+
+    if (localPlayer == nullptr)
+        return;
+
+    localPlayer->setGMLevel(gmLevel);
+}
+
 }  // namespace EAthena
diff --git a/src/net/eathena/playerrecv.h b/src/net/eathena/playerrecv.h
index a4a24bddc..eb38684b8 100644
--- a/src/net/eathena/playerrecv.h
+++ b/src/net/eathena/playerrecv.h
@@ -53,6 +53,7 @@ namespace EAthena
         void processOnlineList(Net::MessageIn &msg);
         void processDressRoomOpen(Net::MessageIn &msg);
         void processKilledBy(Net::MessageIn &msg);
+        void processPlayerAttrs(Net::MessageIn &msg);
     }  // namespace PlayerRecv
 }  // namespace EAthena