From c7a463420bf32a27ff577dd86dead3b40edc2228 Mon Sep 17 00:00:00 2001
From: Chris Miles <akkadius1@gmail.com>
Date: Fri, 16 May 2025 13:38:42 -0500
Subject: [PATCH] [World] Fix Rarer Reload Deadlock (#4893)

---
 world/eqemu_api_world_data_service.cpp |  3 ++-
 world/zonelist.cpp                     | 17 +++++++++++++++++
 world/zonelist.h                       |  3 +++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/world/eqemu_api_world_data_service.cpp b/world/eqemu_api_world_data_service.cpp
index 7a15162e7..f843f1230 100644
--- a/world/eqemu_api_world_data_service.cpp
+++ b/world/eqemu_api_world_data_service.cpp
@@ -162,7 +162,8 @@ void EQEmuApiWorldDataService::reload(Json::Value &r, const std::vector<std::str
 	for (auto &t: ServerReload::GetTypes()) {
 		if (std::to_string(t) == command || Strings::ToLower(ServerReload::GetName(t)) == command) {
 			message(r, fmt::format("Reloading [{}] globally", ServerReload::GetName(t)));
-			zoneserver_list.SendServerReload(t, nullptr);
+			LogInfo("Queueing reload of type [{}] to zones", ServerReload::GetName(t));
+			zoneserver_list.QueueServerReload(t);
 		}
 		found_command = true;
 	}
diff --git a/world/zonelist.cpp b/world/zonelist.cpp
index 008f16b5c..9f24c021b 100644
--- a/world/zonelist.cpp
+++ b/world/zonelist.cpp
@@ -132,6 +132,16 @@ void ZSList::Process() {
 			).c_str()
 		);
 	}
+
+	if (!m_queued_reloads.empty()) {
+		m_queued_reloads_mutex.lock();
+		for (auto &type : m_queued_reloads) {
+			LogInfo("Sending reload of type [{}] to zones", ServerReload::GetName(type));
+			SendServerReload(type, nullptr);
+		}
+		m_queued_reloads.clear();
+		m_queued_reloads_mutex.unlock();
+	}
 }
 
 bool ZSList::SendPacket(ServerPacket* pack) {
@@ -1003,3 +1013,10 @@ void ZSList::SendServerReload(ServerReload::Type type, uchar *packet)
 		++counter;
 	}
 }
+
+void ZSList::QueueServerReload(ServerReload::Type &type)
+{
+	m_queued_reloads_mutex.lock();
+	m_queued_reloads.emplace_back(type);
+	m_queued_reloads_mutex.unlock();
+}
diff --git a/world/zonelist.h b/world/zonelist.h
index 0a6450489..085ba149a 100644
--- a/world/zonelist.h
+++ b/world/zonelist.h
@@ -74,7 +74,10 @@ public:
 	const std::list<std::unique_ptr<ZoneServer>> &getZoneServerList() const;
 	inline uint32_t GetServerListCount() { return zone_server_list.size(); }
 	void SendServerReload(ServerReload::Type type, uchar *packet = nullptr);
+	std::mutex m_queued_reloads_mutex;
+	std::vector<ServerReload::Type> m_queued_reloads = {};
 
+	void QueueServerReload(ServerReload::Type &type);
 private:
 	void OnTick(EQ::Timer *t);
 	uint32 NextID;