Don't allow expedition re-invite inside dz

Live requires characters that quit an expedition to zone out before
being re-added. This is probably to avoid exploiting max player
requirements by constantly swapping players in and out
This commit is contained in:
hg
2020-06-15 18:02:07 -04:00
parent 6cce00ec9a
commit 7f669e104b
2 changed files with 8 additions and 1 deletions
+7 -1
View File
@@ -673,13 +673,19 @@ void Expedition::SendLeaderMessage(
bool Expedition::ProcessAddConflicts(Client* leader_client, Client* add_client, bool swapping)
{
if (!add_client) // a null leader_client handled by SendLeaderMessage fallback
if (!add_client) // a null leader_client is handled by SendLeaderMessage fallback
{
return true;
}
bool has_conflict = false;
if (m_dynamiczone.IsCurrentZoneDzInstance())
{
SendLeaderMessage(leader_client, Chat::Red, DZADD_LEAVE_ZONE_FIRST, { add_client->GetName() });
has_conflict = true;
}
auto expedition_id = add_client->GetExpeditionID();
if (expedition_id)
{