aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorForesterDev <forester.manv@gmail.com>2017-03-18 11:07:41 +0100
committerShauren <shauren.trinity@gmail.com>2017-03-18 11:07:41 +0100
commit5d562556c35a9c506bdfaee13b51268ab8e5df67 (patch)
tree9f7f064d8161a02b31f6da5e1f29c1ce05a4a61e /src
parent957d3cda1eca1f4cf7936f587ba2b1c11c9a99b3 (diff)
Core/SocialMgr: fix case when contacts appears in friend list many times
Closes #19306
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Player/SocialMgr.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/server/game/Entities/Player/SocialMgr.cpp b/src/server/game/Entities/Player/SocialMgr.cpp
index 0390dc4b025..ee64c765a21 100644
--- a/src/server/game/Entities/Player/SocialMgr.cpp
+++ b/src/server/game/Entities/Player/SocialMgr.cpp
@@ -125,14 +125,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;
@@ -159,6 +158,8 @@ void PlayerSocial::SendSocialList(Player* player, uint32 flags)
break;
}
+ data.put<uint32>(countPos, count);
+
player->SendDirectMessage(&data);
}