pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-02 23:40: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/dynamic_zone.cpp
+7 -8
View File
@@ -9,7 +9,6 @@
#include "../common/repositories/instance_list_repository.h"
extern ClientList client_list;
extern ZSList zoneserver_list;
Database& DynamicZone::GetDatabase()
{
@@ -18,7 +17,7 @@ Database& DynamicZone::GetDatabase()
bool DynamicZone::SendServerPacket(ServerPacket* packet)
{
return zoneserver_list.SendPacket(packet);
return ZSList::Instance()->SendPacket(packet);
}
DynamicZone* DynamicZone::FindDynamicZoneByID(uint32_t dz_id)
@@ -91,7 +90,7 @@ DynamicZoneStatus DynamicZone::Process()
{
status = DynamicZoneStatus::Expired;
auto dz_zoneserver = zoneserver_list.FindByInstanceID(GetInstanceID());
auto dz_zoneserver = ZSList::Instance()->FindByInstanceID(GetInstanceID());
if (!dz_zoneserver || dz_zoneserver->NumPlayers() == 0) // no clients inside dz
{
status = DynamicZoneStatus::ExpiredEmpty;
@@ -119,7 +118,7 @@ void DynamicZone::SendZonesDynamicZoneDeleted()
auto pack = std::make_unique<ServerPacket>(ServerOP_DzDeleted, pack_size);
auto buf = reinterpret_cast<ServerDzID_Struct*>(pack->pBuffer);
buf->dz_id = GetID();
zoneserver_list.SendPacket(pack.get());
ZSList::Instance()->SendPacket(pack.get());
}
void DynamicZone::SetSecondsRemaining(uint32_t seconds_remaining)
@@ -154,7 +153,7 @@ void DynamicZone::SendZonesDurationUpdate()
auto packbuf = reinterpret_cast<ServerDzSetDuration_Struct*>(pack->pBuffer);
packbuf->dz_id = GetID();
packbuf->seconds = static_cast<uint32_t>(m_duration.count());
zoneserver_list.SendPacket(pack.get());
ZSList::Instance()->SendPacket(pack.get());
}
void DynamicZone::SendZonesLeaderChanged()
@@ -164,7 +163,7 @@ void DynamicZone::SendZonesLeaderChanged()
auto buf = reinterpret_cast<ServerDzLeaderID_Struct*>(pack->pBuffer);
buf->dz_id = GetID();
buf->leader_id = GetLeaderID();
zoneserver_list.SendPacket(pack.get());
ZSList::Instance()->SendPacket(pack.get());
}
void DynamicZone::ProcessMemberAddRemove(const DynamicZoneMember& member, bool removed)
@@ -198,7 +197,7 @@ void DynamicZone::SendZonesExpireWarning(uint32_t minutes_remaining)
auto buf = reinterpret_cast<ServerDzExpireWarning_Struct*>(pack->pBuffer);
buf->dz_id = GetID();
buf->minutes_remaining = minutes_remaining;
zoneserver_list.SendPacket(pack.get());
ZSList::Instance()->SendPacket(pack.get());
}
void DynamicZone::SendZoneMemberStatuses(uint16_t zone_id, uint16_t instance_id)
@@ -217,7 +216,7 @@ void DynamicZone::SendZoneMemberStatuses(uint16_t zone_id, uint16_t instance_id)
buf->entries[i].online_status = static_cast<uint8_t>(m_members[i].status);
}
zoneserver_list.SendPacket(zone_id, instance_id, pack.get());
ZSList::Instance()->SendPacket(zone_id, instance_id, pack.get());
}
void DynamicZone::CacheMemberStatuses()