pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-03 08:00:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Code] ZSList Global to Singleton Cleanup (#4940)

Browse Source 
* [Code] ZSList Global to Singleton Cleanup

* Final

* Post merge fixes

---------

Co-authored-by: Chris Miles <akkadius1@gmail.com>
This commit is contained in:
Alex King
2025-06-25 16:16:44 -04:00
committed by GitHub
parent 643ee56433
commit dc261bb203
24 changed files with 266 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/eqemu_api_world_data_service.cpp
+3 -4
View File
@@ -13,13 +13,12 @@
#include "ucs.h"
#include "queryserv.h"
extern ZSList zoneserver_list;
extern ClientList client_list;
extern WorldGuildManager guild_mgr;
void callGetZoneList(Json::Value &response)
{
for (auto &zone: zoneserver_list.getZoneServerList()) {
for (auto &zone: ZSList::Instance()->getZoneServerList()) {
Json::Value row;
if (!zone) {
@@ -139,7 +138,7 @@ void getReloadTypes(Json::Value &response)
void getServerCounts(Json::Value &response, const std::vector<std::string> &args)
{
response["zone_count"] = zoneserver_list.GetServerListCount();
response["zone_count"] = ZSList::Instance()->GetServerListCount();
response["client_count"] = ClientList::Instance()->GetClientCount();
}
@@ -165,7 +164,7 @@ void EQEmuApiWorldDataService::reload(Json::Value &r, const std::vector<std::str
if (std::to_string(t) == command || Strings::ToLower(ServerReload::GetName(t)) == command) {
message(r, fmt::format("Reloading [{}] globally", ServerReload::GetName(t)));
LogInfo("Queueing reload of type [{}] to zones", ServerReload::GetName(t));
zoneserver_list.QueueServerReload(t);
ZSList::Instance()->QueueServerReload(t);
}
found_command = true;
}