Move offline players to dz safereturn

This is an experimental change which allows members to log in at the
safe return if they were offline when the expedition was deleted.
Prior to this they would log in at bind instead

Partially reverts commit 32c69d235d
Removed expedition members are no longer hard deleted from db

world/expedition_database.cpp

@@ -32,7 +32,7 @@ void ExpeditionDatabase::PurgeExpiredExpeditions()
 			LEFT JOIN instance_list ON dynamic_zones.instance_id = instance_list.id
 			LEFT JOIN
 				(
-					SELECT expedition_id, COUNT(*) member_count
+					SELECT expedition_id, COUNT(IF(is_current_member = TRUE, 1, NULL)) member_count
 					FROM expedition_members
 					GROUP BY expedition_id
 				) expedition_members
@@ -40,6 +40,7 @@ void ExpeditionDatabase::PurgeExpiredExpeditions()
 		WHERE
 			instance_list.id IS NULL
 			OR expedition_members.member_count IS NULL
+			OR expedition_members.member_count = 0
 			OR (instance_list.start_time + instance_list.duration) <= UNIX_TIMESTAMP();
 	);
 
@@ -51,7 +52,12 @@ void ExpeditionDatabase::PurgeExpiredExpeditions()
 		{
 			expedition_ids.emplace_back(static_cast<uint32_t>(strtoul(row[0], nullptr, 10)));
 		}
-		ExpeditionDatabase::DeleteExpeditions(expedition_ids);
+
+		if (!expedition_ids.empty())
+		{
+			ExpeditionDatabase::MoveMembersToSafeReturn(expedition_ids);
+			ExpeditionDatabase::DeleteExpeditions(expedition_ids);
+		}
 	}
 }
 
@@ -83,6 +89,7 @@ std::vector<Expedition> ExpeditionDatabase::LoadExpeditions(uint32_t select_expe
 			INNER JOIN dynamic_zones ON expeditions.dynamic_zone_id = dynamic_zones.id
 			INNER JOIN instance_list ON dynamic_zones.instance_id = instance_list.id
 			INNER JOIN expedition_members ON expedition_members.expedition_id = expeditions.id
+				AND expedition_members.is_current_member = TRUE
 	);
 
 	if (select_expedition_id != 0)
@@ -180,3 +187,29 @@ void ExpeditionDatabase::UpdateLeaderID(uint32_t expedition_id, uint32_t leader_
 
 	database.QueryDatabase(query);
 }
+
+void ExpeditionDatabase::MoveMembersToSafeReturn(const std::vector<uint32_t>& expedition_ids)
+{
+	LogExpeditionsDetail("Moving members from [{}] expedition(s) to safereturn", expedition_ids.size());
+
+	// only offline members still in expired dz zones should be updated here
+	std::string query = fmt::format(SQL(
+		UPDATE character_data
+			INNER JOIN expedition_members ON character_data.id = expedition_members.character_id
+			INNER JOIN expeditions ON expedition_members.expedition_id = expeditions.id
+			INNER JOIN dynamic_zones ON expeditions.dynamic_zone_id = dynamic_zones.id
+			INNER JOIN instance_list ON dynamic_zones.instance_id = instance_list.id
+				AND character_data.zone_instance = instance_list.id
+				AND character_data.zone_id = instance_list.zone
+		SET
+			zone_id       = IF(safe_return_zone_id > 0, safe_return_zone_id, zone_id),
+			zone_instance = IF(safe_return_zone_id > 0, 0, zone_instance),
+			x             = IF(safe_return_zone_id > 0, safe_return_x, x),
+			y             = IF(safe_return_zone_id > 0, safe_return_y, y),
+			z             = IF(safe_return_zone_id > 0, safe_return_z, z),
+			heading       = IF(safe_return_zone_id > 0, safe_return_heading, heading)
+		WHERE expeditions.id IN ({});
+	), fmt::join(expedition_ids, ","));
+
+	database.QueryDatabase(query);
+}

world/expedition_database.h

@@ -31,6 +31,7 @@ namespace ExpeditionDatabase
 	void DeleteExpeditions(const std::vector<uint32_t>& expedition_ids);
 	std::vector<Expedition> LoadExpeditions(uint32_t select_expedition_id = 0);
 	Expedition LoadExpedition(uint32_t expedition_id);
+	void MoveMembersToSafeReturn(const std::vector<uint32_t>& expedition_ids);
 	void PurgeExpiredExpeditions();
 	void PurgeExpiredCharacterLockouts();
 	void UpdateDzDuration(uint16_t instance_id, uint32_t new_duration);

world/expedition_state.cpp

@@ -152,6 +152,7 @@ void ExpeditionState::Process()
 
 	if (!expedition_ids.empty())
 	{
+		ExpeditionDatabase::MoveMembersToSafeReturn(expedition_ids);
 		ExpeditionDatabase::DeleteExpeditions(expedition_ids);
 	}
 }

world/main.cpp

@@ -425,16 +425,16 @@ int main(int argc, char** argv) {
 
 	adventure_manager.LoadLeaderboardInfo();
 
+	LogInfo("Purging expired expeditions");
+	ExpeditionDatabase::PurgeExpiredExpeditions();
+	ExpeditionDatabase::PurgeExpiredCharacterLockouts();
+
 	LogInfo("Purging expired instances");
 	database.PurgeExpiredInstances();
 
 	Timer PurgeInstanceTimer(450000);
 	PurgeInstanceTimer.Start(450000);
 
-	LogInfo("Purging expired expeditions");
-	ExpeditionDatabase::PurgeExpiredExpeditions();
-	ExpeditionDatabase::PurgeExpiredCharacterLockouts();
-
 	LogInfo("Loading active expeditions");
 	expedition_state.LoadActiveExpeditions();