pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 05:21:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reduce packet updates when expedition member added

Browse Source 
This fixes unnecessary packets and compass updates being sent for
invited members and better matches live's packet update pattern

This also fixes duplicate updates being sent to the added member

Live only sends a MemberListName update for members added through a
swap (player count doesn't change). For members added through an
invite it sends expedition info and a full member list update

A full member list update is sent for both cases in this patch. This
is because MemberListName currently always adds members with status
"unknown". This is either due to unknown packet fields or a change
in future clients
This commit is contained in:
hg 2020-10-23 20:49:30 -04:00
parent 074b7096df
commit f506ce9d58
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
zone/expedition.cpp
View File

@ -607,7 +607,7 @@ void Expedition::SwapMember(Client* add_client, const std::string& remove_char_n
m_dynamiczone.AddCharacter(add_client->CharacterID()); m_dynamiczone.AddCharacter(add_client->CharacterID());
ProcessMemberRemoved(member.name, member.char_id); ProcessMemberRemoved(member.name, member.char_id);
ProcessMemberAdded(add_client->GetName(), add_client->CharacterID()); ProcessMemberAdded(add_client->GetName(), add_client->CharacterID(), true);
SendWorldMemberSwapped(member.name, member.char_id, add_client->GetName(), add_client->CharacterID()); SendWorldMemberSwapped(member.name, member.char_id, add_client->GetName(), add_client->CharacterID());
if (!m_members.empty() && member.char_id == m_leader.char_id) if (!m_members.empty() && member.char_id == m_leader.char_id)
@ -1223,7 +1223,7 @@ void Expedition::ProcessMakeLeader(
} }
} }
void Expedition::ProcessMemberAdded(const std::string& char_name, uint32_t added_char_id) void Expedition::ProcessMemberAdded(const std::string& char_name, uint32_t added_char_id, bool was_swapped)
{ {
// adds the member to this expedition and notifies both leader and new member // adds the member to this expedition and notifies both leader and new member
Client* leader_client = entity_list.GetClientByCharID(m_leader.char_id); Client* leader_client = entity_list.GetClientByCharID(m_leader.char_id);
@ -1232,6 +1232,8 @@ void Expedition::ProcessMemberAdded(const std::string& char_name, uint32_t added
leader_client->MessageString(Chat::Yellow, EXPEDITION_MEMBER_ADDED, char_name.c_str(), m_expedition_name.c_str()); leader_client->MessageString(Chat::Yellow, EXPEDITION_MEMBER_ADDED, char_name.c_str(), m_expedition_name.c_str());
} }
AddInternalMember(char_name, added_char_id, ExpeditionMemberStatus::Online);
Client* member_client = entity_list.GetClientByCharID(added_char_id); Client* member_client = entity_list.GetClientByCharID(added_char_id);
if (member_client) if (member_client)
{ {
@ -1241,9 +1243,7 @@ void Expedition::ProcessMemberAdded(const std::string& char_name, uint32_t added
member_client->MessageString(Chat::Yellow, EXPEDITION_MEMBER_ADDED, char_name.c_str(), m_expedition_name.c_str()); member_client->MessageString(Chat::Yellow, EXPEDITION_MEMBER_ADDED, char_name.c_str(), m_expedition_name.c_str());
} }
AddInternalMember(char_name, added_char_id, ExpeditionMemberStatus::Online); SendNewMemberAddedToZoneMembers(char_name, was_swapped);
SendUpdatesToZoneMembers(); // live sends full update when member added
} }
void Expedition::ProcessMemberRemoved(const std::string& removed_char_name, uint32_t removed_char_id) void Expedition::ProcessMemberRemoved(const std::string& removed_char_name, uint32_t removed_char_id)
@ -1402,6 +1402,33 @@ void Expedition::AddLockoutClients(
} }
} }
void Expedition::SendNewMemberAddedToZoneMembers(const std::string& added_name, bool was_swapped)
{
// live only sends a MemberListName update when members are added from a swap
// otherwise it updates info (for player count change) and the full member list
auto outapp_info = was_swapped ? nullptr : CreateInfoPacket(false);
// always send full list, MemberListName adds as "unknown" status (missing packet fields or client change)
//auto outapp_members = was_swapped ? CreateMemberListNamePacket(added_name, false) : CreateMemberListPacket(false);
auto outapp_members = CreateMemberListPacket(false);
for (const auto& member : m_members)
{
if (member.name != added_name) // new member already updated
{
Client* member_client = entity_list.GetClientByCharID(member.char_id);
if (member_client)
{
if (outapp_info)
{
member_client->QueuePacket(outapp_info.get());
}
member_client->QueuePacket(outapp_members.get());
}
}
}
}
void Expedition::SendUpdatesToZoneMembers(bool clear, bool message_on_clear) void Expedition::SendUpdatesToZoneMembers(bool clear, bool message_on_clear)
{ {
if (!m_members.empty()) if (!m_members.empty())
@ -1937,7 +1964,7 @@ void Expedition::HandleWorldMessage(ServerPacket* pack)
if (expedition) if (expedition)
{ {
expedition->ProcessMemberRemoved(buf->remove_char_name, buf->remove_char_id); expedition->ProcessMemberRemoved(buf->remove_char_name, buf->remove_char_id);
expedition->ProcessMemberAdded(buf->add_char_name, buf->add_char_id); expedition->ProcessMemberAdded(buf->add_char_name, buf->add_char_id, true);
} }
} }
break; break;

3
zone/expedition.h
View File

@ -181,7 +181,7 @@ private:
void ProcessLockoutDuration(const ExpeditionLockoutTimer& lockout, int seconds, bool members_only = false); void ProcessLockoutDuration(const ExpeditionLockoutTimer& lockout, int seconds, bool members_only = false);
void ProcessLockoutUpdate(const ExpeditionLockoutTimer& lockout, bool remove, bool members_only = false); void ProcessLockoutUpdate(const ExpeditionLockoutTimer& lockout, bool remove, bool members_only = false);
void ProcessMakeLeader(Client* old_leader, Client* new_leader, const std::string& new_leader_name, bool is_online); void ProcessMakeLeader(Client* old_leader, Client* new_leader, const std::string& new_leader_name, bool is_online);
void ProcessMemberAdded(const std::string& added_char_name, uint32_t added_char_id); void ProcessMemberAdded(const std::string& added_char_name, uint32_t added_char_id, bool was_swapped = false);
void ProcessMemberRemoved(const std::string& removed_char_name, uint32_t removed_char_id); void ProcessMemberRemoved(const std::string& removed_char_name, uint32_t removed_char_id);
void SaveLockouts(ExpeditionRequest& request); void SaveLockouts(ExpeditionRequest& request);
void SaveMembers(ExpeditionRequest& request); void SaveMembers(ExpeditionRequest& request);
@ -190,6 +190,7 @@ private:
void SendLeaderMessage(Client* leader_client, uint16_t chat_type, uint32_t string_id, void SendLeaderMessage(Client* leader_client, uint16_t chat_type, uint32_t string_id,
const std::initializer_list<std::string>& args = {}); const std::initializer_list<std::string>& args = {});
void SendMembersExpireWarning(uint32_t minutes); void SendMembersExpireWarning(uint32_t minutes);
void SendNewMemberAddedToZoneMembers(const std::string& added_name, bool was_swapped);
void SendUpdatesToZoneMembers(bool clear = false, bool message_on_clear = true); void SendUpdatesToZoneMembers(bool clear = false, bool message_on_clear = true);
void SendWorldDzLocationUpdate(uint16_t server_opcode, const DynamicZoneLocation& location); void SendWorldDzLocationUpdate(uint16_t server_opcode, const DynamicZoneLocation& location);
void SendWorldExpeditionUpdate(uint16_t server_opcode); void SendWorldExpeditionUpdate(uint16_t server_opcode);