sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(Core/Achievements): Send guild's name instead of the player's one when achieved realm first kill. (#5409)

Browse Source
This commit is contained in:
UltraNix
2021-04-24 20:34:23 +02:00
committed by GitHub
parent 45d92751dd
commit c75d8b9174
1 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Achievements/AchievementMgr.cpp
+27 -12
View File
@@ -665,7 +665,8 @@ void AchievementMgr::SendAchievementEarned(AchievementEntry const* achievement)
LOG_DEBUG("achievement", "AchievementMgr::SendAchievementEarned(%u)", achievement->ID); LOG_DEBUG("achievement", "AchievementMgr::SendAchievementEarned(%u)", achievement->ID);
#endif #endif
if (Guild* guild = sGuildMgr->GetGuildById(GetPlayer()->GetGuildId())) Guild* guild = sGuildMgr->GetGuildById(GetPlayer()->GetGuildId());
if (guild)
{ {
acore::AchievementChatBuilder say_builder(*GetPlayer(), CHAT_MSG_GUILD_ACHIEVEMENT, LANG_ACHIEVEMENT_EARNED, achievement->ID); acore::AchievementChatBuilder say_builder(*GetPlayer(), CHAT_MSG_GUILD_ACHIEVEMENT, LANG_ACHIEVEMENT_EARNED, achievement->ID);
acore::LocalizedPacketDo<acore::AchievementChatBuilder> say_do(say_builder); acore::LocalizedPacketDo<acore::AchievementChatBuilder> say_do(say_builder);
@@ -674,19 +675,33 @@ void AchievementMgr::SendAchievementEarned(AchievementEntry const* achievement)
if (achievement->flags & (ACHIEVEMENT_FLAG_REALM_FIRST_KILL | ACHIEVEMENT_FLAG_REALM_FIRST_REACH)) if (achievement->flags & (ACHIEVEMENT_FLAG_REALM_FIRST_KILL | ACHIEVEMENT_FLAG_REALM_FIRST_REACH))
{ {
TeamId teamId = GetPlayer()->GetTeamId(); // If guild exists - send its name to the server
// If guild does not exist - send player's name to the server
if (achievement->flags & ACHIEVEMENT_FLAG_REALM_FIRST_KILL && guild)
{
WorldPacket data(SMSG_SERVER_FIRST_ACHIEVEMENT, guild->GetName().size() + 1 + 8 + 4 + 4);
data << guild->GetName();
data << uint64(GetPlayer()->GetGUID());
data << uint32(achievement->ID);
data << uint32(0); // display name as plain string in chat (always 0 for guild)
sWorld->SendGlobalMessage(&data);
}
else
{
TeamId teamId = GetPlayer()->GetTeamId();
// broadcast realm first reached // broadcast realm first reached
WorldPacket data(SMSG_SERVER_FIRST_ACHIEVEMENT, GetPlayer()->GetName().size() + 1 + 8 + 4 + 4); WorldPacket data(SMSG_SERVER_FIRST_ACHIEVEMENT, GetPlayer()->GetName().size() + 1 + 8 + 4 + 4);
data << GetPlayer()->GetName(); data << GetPlayer()->GetName();
data << uint64(GetPlayer()->GetGUID()); data << uint64(GetPlayer()->GetGUID());
data << uint32(achievement->ID); data << uint32(achievement->ID);
std::size_t linkTypePos = data.wpos(); std::size_t linkTypePos = data.wpos();
data << uint32(1); // display name as clickable link in chat data << uint32(1); // display name as clickable link in chat
sWorld->SendGlobalMessage(&data, nullptr, teamId); sWorld->SendGlobalMessage(&data, nullptr, teamId);
data.put<uint32>(linkTypePos, 0); // display name as plain string in chat data.put<uint32>(linkTypePos, 0); // display name as plain string in chat
sWorld->SendGlobalMessage(&data, nullptr, teamId == TEAM_ALLIANCE ? TEAM_HORDE : TEAM_ALLIANCE); sWorld->SendGlobalMessage(&data, nullptr, teamId == TEAM_ALLIANCE ? TEAM_HORDE : TEAM_ALLIANCE);
}
} }
// if player is in world he can tell his friends about new achievement // if player is in world he can tell his friends about new achievement
else if (GetPlayer()->IsInWorld()) else if (GetPlayer()->IsInWorld())