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

Merge pull request #1200 from hgtw/fix/empty-expedition-invite

Browse Source 
Verify expedition is not empty on invites
This commit is contained in:
Alex 2021-01-30 21:43:35 -05:00 committed by GitHub
commit 9713d62849
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zone/expedition.cpp
View File

@ -781,11 +781,19 @@ bool Expedition::ProcessAddConflicts(Client* leader_client, Client* add_client,
}
}
// swapping ignores the max player count check since it's a 1:1 change
if (!swapping && ExpeditionDatabase::GetMemberCount(m_id) >= m_max_players)
// member swapping integrity is handled by invite response
if (!swapping)
{
SendLeaderMessage(leader_client, Chat::Red, DZADD_EXCEED_MAX, { fmt::format_int(m_max_players).str() });
has_conflict = true;
auto member_count = ExpeditionDatabase::GetMemberCount(m_id);
if (member_count == 0)
{
has_conflict = true;
}
else if (member_count >= m_max_players)
{
SendLeaderMessage(leader_client, Chat::Red, DZADD_EXCEED_MAX, { fmt::format_int(m_max_players).str() });
has_conflict = true;
}
}
auto invite_id = add_client->GetPendingExpeditionInviteID();