mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-22 12:18:27 +00:00
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:
+7
-1
@@ -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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user