diff options
| -rwxr-xr-x | src/server/game/Groups/Group.cpp | 102 | ||||
| -rwxr-xr-x | src/server/game/Groups/Group.h | 1 |
2 files changed, 60 insertions, 43 deletions
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 039a2c8e517..df9ed7a4145 100755 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -1184,59 +1184,75 @@ void Group::SendTargetIconList(WorldSession* session) void Group::SendUpdate() { - Player* player; - for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr) + for (member_witerator witr = m_memberSlots.begin(); witr != m_memberSlots.end(); ++witr) { - player = ObjectAccessor::FindPlayer(citr->guid); - if (!player || !player->GetSession() || player->GetGroup() != this) - continue; + SendUpdateToPlayer(witr->guid, &(*witr)); + } +} - WorldPacket data(SMSG_GROUP_LIST, (1+1+1+1+1+4+8+4+4+(GetMembersCount()-1)*(13+8+1+1+1+1)+8+1+8+1+1+1+1)); - data << uint8(m_groupType); // group type (flags in 3.3) - data << uint8(citr->group); - data << uint8(citr->flags); - data << uint8(citr->roles); - if (isLFGGroup()) - { - data << uint8(sLFGMgr->GetState(m_guid) == LFG_STATE_FINISHED_DUNGEON ? 2 : 0); // FIXME - Dungeon save status? 2 = done - data << uint32(sLFGMgr->GetDungeon(m_guid)); - } +void Group::SendUpdateToPlayer(uint64 playerGUID, MemberSlot* slot) +{ + Player* player = ObjectAccessor::FindPlayer(playerGUID); - data << uint64(m_guid); - data << uint32(m_counter++); // 3.3, value increases every time this packet gets sent - data << uint32(GetMembersCount()-1); - for (member_citerator citr2 = m_memberSlots.begin(); citr2 != m_memberSlots.end(); ++citr2) - { - if (citr->guid == citr2->guid) - continue; + if (!player || !player->GetSession() || player->GetGroup() != this) + return; - Player* member = ObjectAccessor::FindPlayer(citr2->guid); + // if MemberSlot wasn't provided + if (!slot) + { + member_witerator witr = _getMemberWSlot(playerGUID); - uint8 onlineState = (member) ? MEMBER_STATUS_ONLINE : MEMBER_STATUS_OFFLINE; - onlineState = onlineState | ((isBGGroup()) ? MEMBER_STATUS_PVP : 0); + if (witr == m_memberSlots.end()) // if there is no MemberSlot for such a player + return; - data << citr2->name; - data << uint64(citr2->guid); // guid - data << uint8(onlineState); // online-state - data << uint8(citr2->group); // groupid - data << uint8(citr2->flags); // See enum GroupMemberFlags - data << uint8(citr2->roles); // Lfg Roles - } + slot = &(*witr); + } + + WorldPacket data(SMSG_GROUP_LIST, (1+1+1+1+1+4+8+4+4+(GetMembersCount()-1)*(13+8+1+1+1+1)+8+1+8+1+1+1+1)); + data << uint8(m_groupType); // group type (flags in 3.3) + data << uint8(slot->group); + data << uint8(slot->flags); + data << uint8(slot->roles); + if (isLFGGroup()) + { + data << uint8(sLFGMgr->GetState(m_guid) == LFG_STATE_FINISHED_DUNGEON ? 2 : 0); // FIXME - Dungeon save status? 2 = done + data << uint32(sLFGMgr->GetDungeon(m_guid)); + } - data << uint64(m_leaderGuid); // leader guid + data << uint64(m_guid); + data << uint32(m_counter++); // 3.3, value increases every time this packet gets sent + data << uint32(GetMembersCount()-1); + for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr) + { + if (slot->guid == citr->guid) + continue; - if (GetMembersCount() - 1) - { - data << uint8(m_lootMethod); // loot method - data << uint64(m_looterGuid); // looter guid - data << uint8(m_lootThreshold); // loot threshold - data << uint8(m_dungeonDifficulty); // Dungeon Difficulty - data << uint8(m_raidDifficulty); // Raid Difficulty - data << uint8(0); // 3.3 - } + Player* member = ObjectAccessor::FindPlayer(citr->guid); + + uint8 onlineState = (member) ? MEMBER_STATUS_ONLINE : MEMBER_STATUS_OFFLINE; + onlineState = onlineState | ((isBGGroup()) ? MEMBER_STATUS_PVP : 0); - player->GetSession()->SendPacket(&data); + data << citr->name; + data << uint64(citr->guid); // guid + data << uint8(onlineState); // online-state + data << uint8(citr->group); // groupid + data << uint8(citr->flags); // See enum GroupMemberFlags + data << uint8(citr->roles); // Lfg Roles } + + data << uint64(m_leaderGuid); // leader guid + + if (GetMembersCount() - 1) + { + data << uint8(m_lootMethod); // loot method + data << uint64(m_looterGuid); // looter guid + data << uint8(m_lootThreshold); // loot threshold + data << uint8(m_dungeonDifficulty); // Dungeon Difficulty + data << uint8(m_raidDifficulty); // Raid Difficulty + data << uint8(0); // 3.3 + } + + player->GetSession()->SendPacket(&data); } void Group::UpdatePlayerOutOfRange(Player* pPlayer) diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h index 78f7a24a505..9fcc5f66f58 100755 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -260,6 +260,7 @@ class Group //void SendInit(WorldSession* session); void SendTargetIconList(WorldSession* session); void SendUpdate(); + void SendUpdateToPlayer(uint64 playerGUID, MemberSlot* slot = NULL); void UpdatePlayerOutOfRange(Player* pPlayer); // ignore: GUID of player that will be ignored void BroadcastPacket(WorldPacket* packet, bool ignorePlayersInBGRaid, int group=-1, uint64 ignore=0); |