From 43e50352a90a696c50d42b5fb9c98808a71b379d Mon Sep 17 00:00:00 2001
From: Kinglykrab <kinglykrab@gmail.com>
Date: Fri, 20 Jun 2025 22:46:32 -0400
Subject: [PATCH] Final

---
 queryserv/queryserv.cpp | 5 ++---
 queryserv/zonelist.h    | 6 ++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/queryserv/queryserv.cpp b/queryserv/queryserv.cpp
index 07c9fd613..b6bf21a71 100644
--- a/queryserv/queryserv.cpp
+++ b/queryserv/queryserv.cpp
@@ -28,7 +28,6 @@ Database              database;
 std::string           WorldShortName;
 const queryservconfig *Config;
 WorldServer           *worldserver = 0;
-ZSList                zs_list;
 uint32                numzones     = 0;
 
 void CatchSignal(int sig_num)
@@ -122,7 +121,7 @@ int main()
 	server_connection->OnConnectionIdentified(
 		"Zone", [&console](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
 			numzones++;
-			zs_list.Add(new ZoneServer(connection, console.get()));
+			ZSList::Instance()->Add(new ZoneServer(connection, console.get()));
 
 			LogInfo(
 				"New Zone Server connection from [{}] at [{}:{}] zone_count [{}]",
@@ -137,7 +136,7 @@ int main()
 	server_connection->OnConnectionRemoved(
 		"Zone", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
 			numzones--;
-			zs_list.Remove(connection->GetUUID());
+			ZSList::Instance()->Remove(connection->GetUUID());
 
 			LogInfo(
 				"Removed Zone Server connection from [{}] total zone_count [{}]",
diff --git a/queryserv/zonelist.h b/queryserv/zonelist.h
index 3fc41676d..0cb8bdb8b 100644
--- a/queryserv/zonelist.h
+++ b/queryserv/zonelist.h
@@ -17,6 +17,12 @@ public:
 	void                                    Remove(const std::string& uuid);
 	void                                    SendPlayerEventLogSettings();
 
+	static ZSList* Instance()
+	{
+		static ZSList instance;
+		return &instance;
+	}
+
 private:
 	std::list<std::unique_ptr<ZoneServer>> zone_server_list;
 };