From addc1a865d3ca15d7f623883e541000a5eae1dae Mon Sep 17 00:00:00 2001
From: Mitch Freeman <65987027+neckkola@users.noreply.github.com>
Date: Tue, 1 Jul 2025 22:16:28 -0300
Subject: [PATCH] Rebase

Rebase updates
---
 world/login_server.cpp | 6 +++---
 world/zoneserver.cpp   | 6 +++---
 zone/worldserver.cpp   | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/world/login_server.cpp b/world/login_server.cpp
index 5d94394b2..afc272c09 100644
--- a/world/login_server.cpp
+++ b/world/login_server.cpp
@@ -131,7 +131,7 @@ void LoginServer::ProcessUsertoWorldReq(uint16_t opcode, EQ::Net::Packet &p)
 	UsertoWorldRequest *utwr          = (UsertoWorldRequest *) p.Data();
 	uint32              id            = database.GetAccountIDFromLSID(utwr->login, utwr->lsaccountid);
 	auto                status_record = database.GetAccountStatus(id);
-	auto                client        = client_list.FindCLEByAccountID(id);
+	auto                client        = ClientList::Instance()->FindCLEByAccountID(id);
 
 	if (client) {
 		client->SetOfflineMode(status_record.offline);
@@ -772,7 +772,7 @@ void LoginServer::ProcessUserToWorldCancelOfflineRequest(uint16_t opcode, EQ::Ne
 
 	auto trader = TraderRepository::GetAccountZoneIdAndInstanceIdByAccountId(database, id);
 	if (trader.id &&
-		zoneserver_list.IsZoneBootedByZoneIdAndInstanceId(trader.char_zone_id, trader.char_zone_instance_id)) {
+		ZSList::Instance()->IsZoneBootedByZoneIdAndInstanceId(trader.char_zone_id, trader.char_zone_instance_id)) {
 		LogLoginserverDetail(
 			"Step 5a(1) - World Checked offline users zone/instance is booted.  "
 			"Sending packet to zone id {} instance id {}",
@@ -780,7 +780,7 @@ void LoginServer::ProcessUserToWorldCancelOfflineRequest(uint16_t opcode, EQ::Ne
 			trader.char_zone_instance_id);
 
 		server_packet.opcode = ServerOP_UsertoWorldCancelOfflineRequest;
-		zoneserver_list.SendPacketToBootedZones(&server_packet);
+		ZSList::Instance()->SendPacketToBootedZones(&server_packet);
 		return;
 	}
 
diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp
index 29afe2caf..cb6caf7ce 100644
--- a/world/zoneserver.cpp
+++ b/world/zoneserver.cpp
@@ -1677,12 +1677,12 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 			auto in = reinterpret_cast<BazaarPurchaseMessaging_Struct *>(pack->pBuffer);
 			switch (in->transaction_status) {
 				case BazaarPurchaseBuyerCompleteSendToSeller: {
-					zoneserver_list.SendPacket(in->trader_zone_id, in->trader_zone_instance_id, pack);
+					ZSList::Instance()->SendPacket(in->trader_zone_id, in->trader_zone_instance_id, pack);
 					break;
 				}
 				case BazaarPurchaseTraderFailed:
 				case BazaarPurchaseSuccess: {
-					zoneserver_list.SendPacket(in->buyer_zone_id, in->buyer_zone_instance_id, pack);
+					ZSList::Instance()->SendPacket(in->buyer_zone_id, in->buyer_zone_instance_id, pack);
 					break;
 				}
 				default: {
@@ -1752,7 +1752,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 				"Step 7a - World received ServerOP_UsertoWorldCancelOfflineResponse back to login with success."
 			);
 
-			loginserverlist.SendPacket(&server_packet);
+			LoginServerList::Instance()->SendPacket(&server_packet);
 			break;
 		}
 		default: {
diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp
index 1c03b0f21..2cfcdca18 100644
--- a/zone/worldserver.cpp
+++ b/zone/worldserver.cpp
@@ -3946,7 +3946,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 					uint64 total_cost =
 						static_cast<uint64>(in->trader_buy_struct.price) * static_cast<uint64>(in->item_quantity);
 
-					if (player_event_logs.IsEventEnabled(PlayerEvent::TRADER_PURCHASE)) {
+					if (PlayerEventLogs::Instance()->IsEventEnabled(PlayerEvent::TRADER_PURCHASE)) {
 						auto e = PlayerEvent::TraderPurchaseEvent{
 							.item_id              = in->trader_buy_struct.item_id,
 							.augment_1_id         = in->item_aug_1,
@@ -3994,7 +3994,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 
 					CharacterParcelsRepository::InsertOne(database, parcel_out);
 
-					if (player_event_logs.IsEventEnabled(PlayerEvent::PARCEL_SEND)) {
+					if (PlayerEventLogs::Instance()->IsEventEnabled(PlayerEvent::PARCEL_SEND)) {
 						PlayerEvent::ParcelSend e{};
 						e.from_player_name = parcel_out.from_name;
 						e.to_player_name   = buyer->GetCleanName();