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

Don't send info packet when new member added

Browse Source 
It isn't necessary to send this packet to current members when a new
expedition member is added. The member list packet changes the current
player count on the window
This commit is contained in:
hg 2020-10-25 22:17:12 -04:00
parent f506ce9d58
commit 8708564889
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
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(), true); ProcessMemberAdded(add_client->GetName(), add_client->CharacterID());
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, bool was_swapped) void Expedition::ProcessMemberAdded(const std::string& char_name, uint32_t added_char_id)
{ {
// 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);
@ -1243,7 +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());
} }
SendNewMemberAddedToZoneMembers(char_name, was_swapped); SendNewMemberAddedToZoneMembers(char_name);
} }
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,14 +1402,12 @@ void Expedition::AddLockoutClients(
} }
} }
void Expedition::SendNewMemberAddedToZoneMembers(const std::string& added_name, bool was_swapped) void Expedition::SendNewMemberAddedToZoneMembers(const std::string& added_name)
{ {
// live only sends a MemberListName update when members are added from a swap // live only sends MemberListName when members are added from a swap, otherwise
// otherwise it updates info (for player count change) and the full member list // it sends expedition info (unnecessary) and the full member list
auto outapp_info = was_swapped ? nullptr : CreateInfoPacket(false); // we send a full member list update for both cases since MemberListName adds as
// "unknown" status (either due to unknown packet fields or future client change)
// 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); auto outapp_members = CreateMemberListPacket(false);
for (const auto& member : m_members) for (const auto& member : m_members)
@ -1419,10 +1417,6 @@ void Expedition::SendNewMemberAddedToZoneMembers(const std::string& added_name,
Client* member_client = entity_list.GetClientByCharID(member.char_id); Client* member_client = entity_list.GetClientByCharID(member.char_id);
if (member_client) if (member_client)
{ {
if (outapp_info)
{
member_client->QueuePacket(outapp_info.get());
}
member_client->QueuePacket(outapp_members.get()); member_client->QueuePacket(outapp_members.get());
} }
} }
@ -1964,7 +1958,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, true); expedition->ProcessMemberAdded(buf->add_char_name, buf->add_char_id);
} }
} }
break; break;

4
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, bool was_swapped = false); void ProcessMemberAdded(const std::string& added_char_name, uint32_t added_char_id);
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,7 +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 SendNewMemberAddedToZoneMembers(const std::string& added_name);
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);