pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 13:16:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Code] LoginServerList Global to Singleton Cleanup (#4941)

Browse Source
This commit is contained in:
Alex King
2025-06-25 14:49:55 -04:00
committed by GitHub
parent 2128b45313
commit 1153c9ab96
10 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/zoneserver.cpp
+5 -6
View File
@@ -55,7 +55,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
extern ClientList client_list;
extern GroupLFPList LFPGroupList;
extern ZSList zoneserver_list;
extern LoginServerList loginserverlist;
extern volatile bool RunLoops;
extern volatile bool UCSServerAvailable_;
extern AdventureManager adventure_manager;
@@ -164,7 +163,7 @@ void ZoneServer::LSBootUpdate(uint32 zone_id, uint32 instanceid, bool startup) {
bootup->zone = zone_id;
bootup->zone_wid = GetID();
bootup->instance = instanceid;
loginserverlist.SendPacket(pack);
LoginServerList::Instance()->SendPacket(pack);
safe_delete(pack);
}
}
@@ -179,7 +178,7 @@ void ZoneServer::LSSleepUpdate(uint32 zone_id) {
auto sleep = (ServerLSZoneSleep_Struct*) pack->pBuffer;
sleep->zone = zone_id;
sleep->zone_wid = GetID();
loginserverlist.SendPacket(pack);
LoginServerList::Instance()->SendPacket(pack);
safe_delete(pack);
}
}
@@ -1076,8 +1075,8 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
WorldConfig::UnlockWorld();
}
if (loginserverlist.Connected()) {
loginserverlist.SendStatus();
if (LoginServerList::Instance()->Connected()) {
LoginServerList::Instance()->SendStatus();
SendEmoteMessage(
l->character_name,
0,
@@ -1339,7 +1338,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
}
case ServerOP_LSAccountUpdate: {
LogNetcode("Received ServerOP_LSAccountUpdate packet from zone");
loginserverlist.SendAccountUpdate(pack);
LoginServerList::Instance()->SendAccountUpdate(pack);
break;
}
case ServerOP_DiscordWebhookMessage: