pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 03:08:26 +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/client.cpp
+7 -8
View File
@@ -89,7 +89,6 @@
std::vector<RaceClassAllocation> character_create_allocations;
std::vector<RaceClassCombos> character_create_race_class_combos;
extern ZSList zoneserver_list;
extern ClientList client_list;
extern uint32 numclients;
extern volatile bool RunLoops;
@@ -1415,18 +1414,18 @@ void Client::EnterWorld(bool TryBootup) {
return;
}
zone_server = zoneserver_list.FindByInstanceID(instance_id);
zone_server = ZSList::Instance()->FindByInstanceID(instance_id);
}
else
{
zone_server = zoneserver_list.FindByZoneID(zone_id);
zone_server = ZSList::Instance()->FindByZoneID(zone_id);
}
const char *zone_name = ZoneName(zone_id, true);
if (zone_server) {
if (false == enter_world_triggered) {
//Drop any clients we own in other zones.
zoneserver_list.DropClient(GetLSID(), zone_server);
ZSList::Instance()->DropClient(GetLSID(), zone_server);
// warn the zone we're coming
zone_server->IncomingClient(this);
@@ -1439,7 +1438,7 @@ void Client::EnterWorld(bool TryBootup) {
if (TryBootup) {
LogInfo("Attempting autobootup of [{}] [{}] [{}]", zone_name, zone_id, instance_id);
autobootup_timeout.Start();
zone_waiting_for_bootup = zoneserver_list.TriggerBootup(zone_id, instance_id);
zone_waiting_for_bootup = ZSList::Instance()->TriggerBootup(zone_id, instance_id);
if (zone_waiting_for_bootup == 0) {
LogInfo("No zoneserver available to boot up");
TellClientZoneUnavailable();
@@ -1455,7 +1454,7 @@ void Client::EnterWorld(bool TryBootup) {
zone_waiting_for_bootup = 0;
if (GetAdmin() < 80 && zoneserver_list.IsZoneLocked(zone_id)) {
if (GetAdmin() < 80 && ZSList::Instance()->IsZoneLocked(zone_id)) {
LogInfo("Enter world failed. Zone is locked");
TellClientZoneUnavailable();
return;
@@ -1501,11 +1500,11 @@ void Client::Clearance(int8 response)
ZoneServer* zs = nullptr;
if(instance_id > 0)
{
zs = zoneserver_list.FindByInstanceID(instance_id);
zs = ZSList::Instance()->FindByInstanceID(instance_id);
}
else
{
zs = zoneserver_list.FindByZoneID(zone_id);
zs = ZSList::Instance()->FindByZoneID(zone_id);
}
if(zs == 0 || response == -1 || response == 0)