From 761c0faf7240752f0fcdf77e8319f353e036c310 Mon Sep 17 00:00:00 2001 From: ForesterDev Date: Sat, 18 Mar 2017 11:07:41 +0100 Subject: [PATCH] Core/SocialMgr: fix case when contacts appears in friend list many times Closes #19306 --- src/server/game/Entities/Player/SocialMgr.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/server/game/Entities/Player/SocialMgr.cpp b/src/server/game/Entities/Player/SocialMgr.cpp index fdfc37de940..21452a9d68e 100644 --- a/src/server/game/Entities/Player/SocialMgr.cpp +++ b/src/server/game/Entities/Player/SocialMgr.cpp @@ -126,14 +126,13 @@ void PlayerSocial::SendSocialList(Player* player, uint32 flags) { ASSERT(player); - uint32 size = _playerSocialMap.size(); - uint32 count = 0; - WorldPacket data(SMSG_CONTACT_LIST, (4 + 4 + size * 25)); // just can guess size + WorldPacket data(SMSG_CONTACT_LIST, (4 + 4 + _playerSocialMap.size() * 25)); // just can guess size data << uint32(flags); // 0x1 = Friendlist update. 0x2 = Ignorelist update. 0x4 = Mutelist update. - data << uint32(size); // friends count + size_t countPos = data.wpos(); + data << uint32(count); // friends count placeholder - for (PlayerSocialMap::value_type& v : _playerSocialMap) + for (auto& v : _playerSocialMap) { if (!(v.second.Flags & flags)) continue; @@ -160,6 +159,8 @@ void PlayerSocial::SendSocialList(Player* player, uint32 flags) break; } + data.put(countPos, count); + player->SendDirectMessage(&data); }