From f42c5358b05e382b718feb3ba7c073dce81c751c Mon Sep 17 00:00:00 2001
From: Chris Miles <akkadius1@gmail.com>
Date: Wed, 25 Jun 2025 15:15:23 -0500
Subject: [PATCH] Post merge fixes

---
 queryserv/worldserver.cpp | 3 +--
 queryserv/zonelist.h      | 2 +-
 world/console.cpp         | 2 +-
 world/main.cpp            | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/queryserv/worldserver.cpp b/queryserv/worldserver.cpp
index 7e8712250..051a8f009 100644
--- a/queryserv/worldserver.cpp
+++ b/queryserv/worldserver.cpp
@@ -26,7 +26,6 @@
 extern WorldServer           worldserver;
 extern const queryservconfig *Config;
 extern QSDatabase            qs_database;
-extern ZSList                zs_list;
 
 WorldServer::WorldServer()
 {
@@ -80,7 +79,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 			if (o->type == ServerReload::Type::Logs) {
 				EQEmuLogSys::Instance()->LoadLogDatabaseSettings();
 				PlayerEventLogs::Instance()->ReloadSettings();
-				zs_list.SendPlayerEventLogSettings();
+				ZSList::Instance()->SendPlayerEventLogSettings();
 			}
 
 			break;
diff --git a/queryserv/zonelist.h b/queryserv/zonelist.h
index 0cb8bdb8b..5bcf1b29b 100644
--- a/queryserv/zonelist.h
+++ b/queryserv/zonelist.h
@@ -6,9 +6,9 @@
 #include <vector>
 #include <memory>
 #include <list>
+#include "zoneserver.h"
 
 class WorldTCPConnection;
-class ZoneServer;
 
 class ZSList {
 public:
diff --git a/world/console.cpp b/world/console.cpp
index 564107f74..03efcfe5e 100644
--- a/world/console.cpp
+++ b/world/console.cpp
@@ -1359,7 +1359,7 @@ void ConsoleWWMarquee(
 
 	strn0cpy(wwm->message, message.c_str(), sizeof(wwm->message));
 
-	zoneserver_list.SendPacket(pack);
+	ZSList::Instance()->SendPacket(pack);
 	safe_delete(pack);
 
 	connection->SendLine(fmt::format("Sent world marquee type {}: {}", type, message));
diff --git a/world/main.cpp b/world/main.cpp
index bac86f7f0..89d895f80 100644
--- a/world/main.cpp
+++ b/world/main.cpp
@@ -413,7 +413,7 @@ int main(int argc, char **argv)
 			}
 		}
 
-		WorldEventScheduler::Instance()->Process(&zoneserver_list);
+		WorldEventScheduler::Instance()->Process(ZSList::Instance());
 
 		client_list.Process();
 		guild_mgr.Process();