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] ZoneStore Global to Singleton Cleanup (#4934)

Browse Source
This commit is contained in:
Alex King
2025-06-23 06:45:06 -04:00
committed by GitHub
parent bac892b582
commit 2e760d6397
26 changed files with 379 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/zone.cpp
+3 -3
View File
@@ -1300,7 +1300,7 @@ void Zone::ReloadStaticData() {
bool Zone::LoadZoneCFG(const char* filename, uint16 instance_version)
{
auto z = zone_store.GetZoneWithFallback(ZoneID(filename), instance_version);
auto z = ZoneStore::Instance()->GetZoneWithFallback(ZoneID(filename), instance_version);
if (!z) {
LogError("Failed to load zone data for [{}] instance_version [{}]", filename, instance_version);
@@ -2251,7 +2251,7 @@ void Zone::LoadZoneBlockedSpells()
if (!content_db.LoadBlockedSpells(zone_total_blocked_spells, blocked_spells, GetZoneID())) {
LogError(
"Failed to load blocked spells for {} ({}).",
zone_store.GetZoneName(GetZoneID(), true),
ZoneStore::Instance()->GetZoneName(GetZoneID(), true),
GetZoneID()
);
ClearBlockedSpells();
@@ -2261,7 +2261,7 @@ void Zone::LoadZoneBlockedSpells()
LogInfo(
"Loaded [{}] blocked spells(s) for {} ({}).",
Strings::Commify(zone_total_blocked_spells),
zone_store.GetZoneName(GetZoneID(), true),
ZoneStore::Instance()->GetZoneName(GetZoneID(), true),
GetZoneID()
);
}