diff options
| -rw-r--r-- | src/server/game/Achievements/AchievementMgr.cpp | 14 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Vignette.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 5 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 10a6a4d9693..d3f3e194d77 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -671,14 +671,14 @@ void PlayerAchievementMgr::SendAchievementEarned(AchievementEntry const* achieve receiver->SendDirectMessage(achievementEarned.Write()); }; + achievementEarnedBuilder(_owner); + if (!(achievement->Flags & ACHIEVEMENT_FLAG_TRACKING_FLAG)) { float dist = sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY); Trinity::MessageDistDeliverer notifier(_owner, achievementEarnedBuilder, dist); Cell::VisitWorldObjects(_owner, notifier, dist); } - else - achievementEarnedBuilder(_owner); } void PlayerAchievementMgr::SendPacket(WorldPacket const* data) const @@ -702,7 +702,7 @@ void GuildAchievementMgr::Reset() ObjectGuid guid = _owner->GetGUID(); for (std::pair<uint32 const, CompletedAchievementData> const& completedAchievement : _completedAchievements) { - auto packetBuilder = [&](Player const* receiver) + _owner->BroadcastWorker([&](Player const* receiver) { WorldPackets::Achievement::GuildAchievementDeleted guildAchievementDeleted; guildAchievementDeleted.AchievementID = completedAchievement.first; @@ -710,8 +710,7 @@ void GuildAchievementMgr::Reset() guildAchievementDeleted.TimeDeleted = *GameTime::GetUtcWowTime(); guildAchievementDeleted.TimeDeleted += receiver->GetSession()->GetTimezoneOffset(); receiver->SendDirectMessage(guildAchievementDeleted.Write()); - }; - _owner->BroadcastWorker(packetBuilder); + }); } _achievementPoints = 0; @@ -1020,7 +1019,7 @@ void GuildAchievementMgr::SendAchievementEarned(AchievementEntry const* achievem sWorld->SendGlobalMessage(serverFirstAchievement.Write()); } - auto guildAchievementEarnedBuilder = [&](Player const* receiver) + _owner->BroadcastWorker([&](Player const* receiver) { WorldPackets::Achievement::GuildAchievementEarned guildAchievementEarned; guildAchievementEarned.AchievementID = achievement->ID; @@ -1028,8 +1027,7 @@ void GuildAchievementMgr::SendAchievementEarned(AchievementEntry const* achievem guildAchievementEarned.TimeEarned = *GameTime::GetUtcWowTime(); guildAchievementEarned.TimeEarned += receiver->GetSession()->GetTimezoneOffset(); receiver->SendDirectMessage(guildAchievementEarned.Write()); - }; - _owner->BroadcastWorker(guildAchievementEarnedBuilder); + }); } void GuildAchievementMgr::SendPacket(WorldPacket const* data) const diff --git a/src/server/game/Entities/Unit/Vignette.cpp b/src/server/game/Entities/Unit/Vignette.cpp index 5b3953c7d7f..846446cea43 100644 --- a/src/server/game/Entities/Unit/Vignette.cpp +++ b/src/server/game/Entities/Unit/Vignette.cpp @@ -51,6 +51,9 @@ void SendVignetteUpdate(VignetteData const& vignette, WorldObject const* owner) receiver->SendDirectMessage(vignetteUpdate.GetRawPacket()); }; + if (Player const* playerOwner = owner->ToPlayer()) + sender(playerOwner); + Trinity::MessageDistDeliverer notifier(owner, sender, owner->GetVisibilityRange()); Cell::VisitWorldObjects(owner, notifier, owner->GetVisibilityRange()); } diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index ab8475a32b6..7547a99f21f 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -3761,7 +3761,7 @@ void Guild::AddGuildNews(uint8 type, ObjectGuid guid, uint32 flags, uint32 value NewsLogEntry& news = m_newsLog.AddEvent(trans, m_id, m_newsLog.GetNextGUID(), GuildNews(type), guid, flags, value); CharacterDatabase.CommitTransaction(trans); - auto packetBuilder = [&](Player const* receiver) + BroadcastWorker([&](Player const* receiver) { WorldPackets::Guild::GuildNews newsPacket; newsPacket.NewsEvents.reserve(1); @@ -3769,8 +3769,7 @@ void Guild::AddGuildNews(uint8 type, ObjectGuid guid, uint32 flags, uint32 value newsPacket.NewsEvents.back().CompletedDate += receiver->GetSession()->GetTimezoneOffset(); receiver->SendDirectMessage(newsPacket.Write()); - }; - BroadcastWorker(packetBuilder); + }); } bool Guild::HasAchieved(uint32 achievementId) const |