From 3e373210c5986118cbce42e79af078d39c52cedd Mon Sep 17 00:00:00 2001
From: hg <4683435+hgtw@users.noreply.github.com>
Date: Thu, 2 Jul 2020 00:15:53 -0400
Subject: [PATCH] Remove dz check in expedition invite reply

Characters can no longer be re-invited while inside a dz, these checks
aren't necessary
---
 zone/expedition.cpp          | 9 +--------
 zone/expedition_database.cpp | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/zone/expedition.cpp b/zone/expedition.cpp
index 1ffa2e386..3fc07b099 100644
--- a/zone/expedition.cpp
+++ b/zone/expedition.cpp
@@ -842,10 +842,8 @@ void Expedition::DzInviteResponse(Client* add_client, bool accepted, const std::
 			}
 		}
 
-		bool add_immediately = m_dynamiczone.IsCurrentZoneDzInstance();
-
 		ExpeditionDatabase::InsertCharacterLockouts(
-			add_client->CharacterID(), pending_lockouts, false, !add_immediately);
+			add_client->CharacterID(), pending_lockouts, false, true);
 
 		if (was_swap_invite)
 		{
@@ -855,11 +853,6 @@ void Expedition::DzInviteResponse(Client* add_client, bool accepted, const std::
 		{
 			AddMember(add_client->GetName(), add_client->CharacterID());
 		}
-
-		if (m_dynamiczone.IsCurrentZoneDzInstance())
-		{
-			SetMemberStatus(add_client, ExpeditionMemberStatus::InDynamicZone);
-		}
 	}
 }
 
diff --git a/zone/expedition_database.cpp b/zone/expedition_database.cpp
index 9f77d537c..f8df4cb81 100644
--- a/zone/expedition_database.cpp
+++ b/zone/expedition_database.cpp
@@ -455,7 +455,7 @@ void ExpeditionDatabase::InsertCharacterLockouts(
 	uint32_t character_id, const std::vector<ExpeditionLockoutTimer>& lockouts,
 	bool replace_timer, bool is_pending)
 {
-	LogExpeditionsDetail("Inserting character [{}] lockouts", character_id);
+	LogExpeditionsDetail("Inserting [{}] lockouts for character [{}]", lockouts.size(), character_id);
 
 	std::string insert_values;
 	for (const auto& lockout : lockouts)