From 6d86c670dda434c7956164b1ca4490b93f8d862f Mon Sep 17 00:00:00 2001
From: ModoX <moardox@gmail.com>
Date: Fri, 19 Aug 2022 16:24:37 +0200
Subject: Core/PacketIO: Drop correct field in SMSG_PARTY_UPDATE and utilize
 new bit properly

* 768811f7823f30644ccdc2570991f4704b19ee12 followup
---
 src/server/game/Groups/Group.cpp                | 5 ++---
 src/server/game/Server/Packets/PartyPackets.cpp | 2 +-
 src/server/game/Server/Packets/PartyPackets.h   | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index 3a1cefe3433..272b21c5366 100644
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -1562,12 +1562,11 @@ void Group::SendUpdateToPlayer(ObjectGuid playerGUID, MemberSlot* slot)
 
         playerInfos.GUID = citr->guid;
         playerInfos.Name = citr->name;
+        playerInfos.Class = citr->_class;
 
         playerInfos.FactionGroup = Player::GetFactionGroupForRace(citr->race);
 
-        playerInfos.Status = MEMBER_STATUS_OFFLINE;
-        if (member && member->GetSession() && !member->GetSession()->PlayerLogout())
-            playerInfos.Status = MEMBER_STATUS_ONLINE | (isBGGroup() || isBFGroup() ? MEMBER_STATUS_PVP : 0);
+        playerInfos.Connected = member && member->GetSession() && !member->GetSession()->PlayerLogout();
 
         playerInfos.Subgroup = citr->group;         // groupid
         playerInfos.Flags = citr->flags;            // See enum GroupMemberFlags
diff --git a/src/server/game/Server/Packets/PartyPackets.cpp b/src/server/game/Server/Packets/PartyPackets.cpp
index 189cecf6351..e0e03834e27 100644
--- a/src/server/game/Server/Packets/PartyPackets.cpp
+++ b/src/server/game/Server/Packets/PartyPackets.cpp
@@ -427,10 +427,10 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Party::PartyPlayerInfo co
     data.WriteBit(playerInfo.VoiceChatSilenced);
     data.WriteBit(playerInfo.FromSocialQueue);
     data << playerInfo.GUID;
-    data << uint8(playerInfo.Status);
     data << uint8(playerInfo.Subgroup);
     data << uint8(playerInfo.Flags);
     data << uint8(playerInfo.RolesAssigned);
+    data << uint8(playerInfo.Class);
     data << uint8(playerInfo.FactionGroup);
     data.WriteString(playerInfo.Name);
     if (!playerInfo.VoiceStateID.empty())
diff --git a/src/server/game/Server/Packets/PartyPackets.h b/src/server/game/Server/Packets/PartyPackets.h
index 443767c88ea..498967d1b74 100644
--- a/src/server/game/Server/Packets/PartyPackets.h
+++ b/src/server/game/Server/Packets/PartyPackets.h
@@ -505,14 +505,14 @@ namespace WorldPackets
             ObjectGuid GUID;
             std::string Name;
             std::string VoiceStateID;   // same as bgs.protocol.club.v1.MemberVoiceState.id
-            uint8 Status = 0u;
+            uint8 Class = 0u;
             uint8 Subgroup = 0u;
             uint8 Flags = 0u;
             uint8 RolesAssigned = 0u;
             uint8 FactionGroup = 0u;
             bool FromSocialQueue = false;
             bool VoiceChatSilenced = false;
-            bool Connected = true;
+            bool Connected = false;
         };
 
         struct PartyLFGInfo
-- 
cgit v1.2.3