Merge pull request LandSandBoat#10368 from LandSandBoat/zone_interface

zach2good · web-flow · commit 55230ff2a6ec · 2026-06-20T22:41:19.000+01:00
Core: Add WeatherContainer, clean up Zone interface surface
diff --git a/src/map/CMakeLists.txt b/src/map/CMakeLists.txt
@@ -159,6 +159,8 @@ set(MAP_CORE_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/universal_container.h
     ${CMAKE_CURRENT_SOURCE_DIR}/weapon_skill.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/weapon_skill.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/weather_container.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/weather_container.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ximesh/transformation_matrix.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ximesh/vector3.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ximesh/ximesh_structs.h
diff --git a/src/map/ai/controllers/mob_controller.cpp b/src/map/ai/controllers/mob_controller.cpp
@@ -1178,7 +1178,7 @@ auto CMobController::DoRoamTick(timer::time_point tick) -> Task<void>
                 {
                     PMob->PAI->Despawn();
                     // Override respawn timer set by CDespawnState for deaggro (60s instead of default)
-                    PMob->loc.zone->spawnHandler()->registerForRespawn(PMob, 60s);
+                    PMob->loc.zone->spawnHandler().registerForRespawn(PMob, 60s);
                     co_return;
                 }
             }
diff --git a/src/map/ai/states/despawn_state.cpp b/src/map/ai/states/despawn_state.cpp
@@ -39,7 +39,7 @@ CDespawnState::CDespawnState(CBaseEntity* _PEntity, bool instantDespawn)
 
     if (auto* PMob = dynamic_cast<CMobEntity*>(_PEntity); PMob && PMob->m_AllowRespawn && PMob->loc.zone != nullptr)
     {
-        PMob->loc.zone->spawnHandler()->registerForRespawn(PMob);
+        PMob->loc.zone->spawnHandler().registerForRespawn(PMob);
     }
 }
 
diff --git a/src/map/campaign_system.cpp b/src/map/campaign_system.cpp
@@ -65,9 +65,11 @@ void LoadState()
     zoneutils::ForEachZone(
         [&state](CZone* PZone)
         {
-            if (PZone->m_CampaignHandler != nullptr)
+            if (PZone->campaignHandler() != nullptr)
             {
-                uint8 nation = (uint8)(PZone->m_CampaignHandler->GetZoneControl() + 1) * 2;
+                auto* handler = PZone->campaignHandler();
+
+                uint8 nation = (uint8)(handler->GetZoneControl() + 1) * 2;
                 switch (nation)
                 {
                     case CampaignControl::SandoriaMask:
@@ -86,17 +88,17 @@ void LoadState()
                 }
 
                 CampaignRegion region;
-                region.campaignId            = PZone->m_CampaignHandler->GetCampaignId();
-                region.status                = PZone->m_CampaignHandler->GetBattleStatus();
-                region.heroism               = PZone->m_CampaignHandler->GetHeroism();
-                region.influenceSandoria     = PZone->m_CampaignHandler->GetInfluence(CampaignArmy::Sandoria);
-                region.influenceBastok       = PZone->m_CampaignHandler->GetInfluence(CampaignArmy::Bastok);
-                region.influenceWindurst     = PZone->m_CampaignHandler->GetInfluence(CampaignArmy::Windurst);
-                region.influenceBeastman     = PZone->m_CampaignHandler->GetInfluence(CampaignArmy::Orcish);
-                region.currentFortifications = PZone->m_CampaignHandler->GetFortification();
-                region.currentResources      = PZone->m_CampaignHandler->GetResource();
-                region.maxFortifications     = PZone->m_CampaignHandler->GetMaxFortification();
-                region.maxResources          = PZone->m_CampaignHandler->GetMaxResource();
+                region.campaignId            = handler->GetCampaignId();
+                region.status                = handler->GetBattleStatus();
+                region.heroism               = handler->GetHeroism();
+                region.influenceSandoria     = handler->GetInfluence(CampaignArmy::Sandoria);
+                region.influenceBastok       = handler->GetInfluence(CampaignArmy::Bastok);
+                region.influenceWindurst     = handler->GetInfluence(CampaignArmy::Windurst);
+                region.influenceBeastman     = handler->GetInfluence(CampaignArmy::Orcish);
+                region.currentFortifications = handler->GetFortification();
+                region.currentResources      = handler->GetResource();
+                region.maxFortifications     = handler->GetMaxFortification();
+                region.maxResources          = handler->GetMaxResource();
                 region.nationControl         = nation;
                 state.regions.emplace_back(region);
             }
diff --git a/src/map/entities/mob_entity.cpp b/src/map/entities/mob_entity.cpp
@@ -844,7 +844,7 @@ auto CMobEntity::GetEligibleGeodes() const -> std::vector<uint16>
     uint8 element = 0;
 
     // Set element by weather
-    if (const Weather weather = loc.zone->GetWeather(); weather >= Weather::HotSpell && weather <= Weather::Darkness)
+    if (const Weather weather = loc.zone->weather().current(); weather >= Weather::HotSpell && weather <= Weather::Darkness)
     {
         /*
         element = zoneutils::GetWeatherElement(weather);
diff --git a/src/map/latent_effect_container.cpp b/src/map/latent_effect_container.cpp
@@ -702,7 +702,7 @@ void CLatentEffectContainer::CheckLatentsWeather()
         return;
     }
 
-    CheckLatentsWeather(PZone->GetWeather());
+    CheckLatentsWeather(PZone->weather().current());
 }
 
 void CLatentEffectContainer::CheckLatentsWeather(Weather weather)
diff --git a/src/map/lua/lua_base_entity.cpp b/src/map/lua/lua_base_entity.cpp
@@ -2631,7 +2631,7 @@ auto CLuaBaseEntity::getWeather(const sol::object& ignoreScholar) const -> uint8
     }
     else
     {
-        weather = zoneutils::GetZone(m_PBaseEntity->getZone())->GetWeather();
+        weather = zoneutils::GetZone(m_PBaseEntity->getZone())->weather().current();
     }
 
     return static_cast<uint8>(weather);
@@ -12266,7 +12266,7 @@ auto CLuaBaseEntity::registerBattlefield(const sol::object& arg0, const sol::obj
         return BATTLEFIELD_RETURN_CODE_BATTLEFIELD_FULL;
     }
 
-    if (m_PBaseEntity->loc.zone->m_BattlefieldHandler == nullptr)
+    if (m_PBaseEntity->loc.zone->battlefieldHandler() == nullptr)
     {
         ShowWarning("m_BattlefieldHandler was null for %s.", m_PBaseEntity->getName());
         return BATTLEFIELD_RETURN_CODE_BATTLEFIELD_FULL;
@@ -12317,7 +12317,7 @@ auto CLuaBaseEntity::registerBattlefield(const sol::object& arg0, const sol::obj
         registration.rules |= battlefield.get<bool>("canLoseExp") ? RULES_LOSE_EXP : 0;
     }
 
-    return PZone->m_BattlefieldHandler->RegisterBattlefield(PChar, registration);
+    return PZone->battlefieldHandler()->RegisterBattlefield(PChar, registration);
 }
 
 auto CLuaBaseEntity::battlefieldAtCapacity(const int battlefieldID) const -> bool
@@ -12328,7 +12328,7 @@ auto CLuaBaseEntity::battlefieldAtCapacity(const int battlefieldID) const -> boo
         return true;
     }
 
-    if (m_PBaseEntity->loc.zone->m_BattlefieldHandler == nullptr)
+    if (m_PBaseEntity->loc.zone->battlefieldHandler() == nullptr)
     {
         ShowWarning("m_BattlefieldHandler was null for %s.", m_PBaseEntity->getName());
         return true;
@@ -12343,14 +12343,14 @@ auto CLuaBaseEntity::battlefieldAtCapacity(const int battlefieldID) const -> boo
     auto* PChar = static_cast<CCharEntity*>(m_PBaseEntity);
     auto* PZone = PChar->loc.zone == nullptr ? zoneutils::GetZone(PChar->loc.destination) : PChar->loc.zone;
 
-    if (!PZone || PZone->m_BattlefieldHandler == nullptr)
+    if (!PZone || PZone->battlefieldHandler() == nullptr)
     {
         ShowWarning("CLuaBaseEntity::battlefieldAtCapacity() - Battlefield Handler is null.");
         return true; // NOTE: We were previously breaking here, so return full in this case.
     }
 
     bool full = false;
-    if (PZone->m_BattlefieldHandler->ReachedMaxCapacity(battlefieldID))
+    if (PZone->battlefieldHandler()->ReachedMaxCapacity(battlefieldID))
     {
         full = true;
     }
@@ -12373,7 +12373,7 @@ auto CLuaBaseEntity::enterBattlefield(const sol::object& area) const -> bool
         return false;
     }
 
-    if (m_PBaseEntity->objtype != TYPE_PC || m_PBaseEntity->loc.zone->m_BattlefieldHandler == nullptr)
+    if (m_PBaseEntity->objtype != TYPE_PC || m_PBaseEntity->loc.zone->battlefieldHandler() == nullptr)
     {
         ShowWarning("CLuaBaseEntity::enterBattlefield() - Non-PC calling function, or Battlefield Handler is null.");
         return false;
@@ -12382,11 +12382,11 @@ auto CLuaBaseEntity::enterBattlefield(const sol::object& area) const -> bool
     CBattlefield* PBattlefield = nullptr;
     if (area == sol::lua_nil)
     {
-        PBattlefield = m_PBaseEntity->loc.zone->m_BattlefieldHandler->GetBattlefield(m_PBaseEntity, true);
+        PBattlefield = m_PBaseEntity->loc.zone->battlefieldHandler()->GetBattlefield(m_PBaseEntity, true);
     }
     else
     {
-        PBattlefield = m_PBaseEntity->loc.zone->m_BattlefieldHandler->GetBattlefieldByArea(area.as<uint8>());
+        PBattlefield = m_PBaseEntity->loc.zone->battlefieldHandler()->GetBattlefieldByArea(area.as<uint8>());
     }
 
     return PBattlefield ? PBattlefield->InsertEntity(m_PBaseEntity, true) : false;
@@ -12407,13 +12407,13 @@ auto CLuaBaseEntity::leaveBattlefield(const uint8 leavecode) const -> bool
         return false;
     }
 
-    if (m_PBaseEntity->objtype == TYPE_NPC || m_PBaseEntity->loc.zone->m_BattlefieldHandler == nullptr)
+    if (m_PBaseEntity->objtype == TYPE_NPC || m_PBaseEntity->loc.zone->battlefieldHandler() == nullptr)
     {
         ShowWarning("CLuaBaseEntity::leaveBattlefield() - NPC calling function, or Battlefield Handler is null.");
         return false;
     }
 
-    return m_PBaseEntity->loc.zone->m_BattlefieldHandler->RemoveFromBattlefield(m_PBaseEntity, m_PBaseEntity->PBattlefield, leavecode);
+    return m_PBaseEntity->loc.zone->battlefieldHandler()->RemoveFromBattlefield(m_PBaseEntity, m_PBaseEntity->PBattlefield, leavecode);
 }
 
 /************************************************************************
@@ -18009,7 +18009,7 @@ auto CLuaBaseEntity::getRespawnTime() const -> uint32
 
     if (auto* PMob = static_cast<CMobEntity*>(m_PBaseEntity); PMob->loc.zone)
     {
-        if (const auto remaining = PMob->loc.zone->spawnHandler()->getRemainingRespawnTime(PMob))
+        if (const auto remaining = PMob->loc.zone->spawnHandler().getRemainingRespawnTime(PMob))
         {
             return static_cast<uint32>(timer::count_seconds(*remaining));
         }
@@ -18041,7 +18041,7 @@ void CLuaBaseEntity::setRespawnTime(const uint32 seconds) const
 
         if (PMob->loc.zone != nullptr)
         {
-            PMob->loc.zone->spawnHandler()->unregister(PMob);
+            PMob->loc.zone->spawnHandler().unregister(PMob);
         }
 
         return;
@@ -18053,7 +18053,7 @@ void CLuaBaseEntity::setRespawnTime(const uint32 seconds) const
     // If mob is not currently spawned, update its pending respawn time in SpawnHandler
     if (!PMob->PAI->IsSpawned() && PMob->loc.zone != nullptr)
     {
-        PMob->loc.zone->spawnHandler()->registerForRespawn(PMob, std::chrono::seconds(seconds));
+        PMob->loc.zone->spawnHandler().registerForRespawn(PMob, std::chrono::seconds(seconds));
     }
 }
 
diff --git a/src/map/lua/lua_battlefield.cpp b/src/map/lua/lua_battlefield.cpp
@@ -330,7 +330,7 @@ void CLuaBattlefield::addGroups(const sol::table& groups, bool hasMultipleArenas
 
         if (!entityIds.empty())
         {
-            uint32 stride = uint32(entityIds.size()) / m_PLuaBattlefield->GetZone()->m_BattlefieldHandler->MaxBattlefieldAreas();
+            uint32 stride = uint32(entityIds.size()) / m_PLuaBattlefield->GetZone()->battlefieldHandler()->MaxBattlefieldAreas();
 
             // Look to see if there's an Armoury Crate within the group of monsters
             static const std::string ARMOURY_CRATE = "Armoury_Crate";
diff --git a/src/map/lua/lua_zone.cpp b/src/map/lua/lua_zone.cpp
@@ -188,16 +188,16 @@ ZONE_TYPE CLuaZone::getTypeMask()
 
 auto CLuaZone::getBattlefieldByInitiator(uint32 charID) -> CBattlefield*
 {
-    if (m_pLuaZone->m_BattlefieldHandler)
+    if (m_pLuaZone->battlefieldHandler())
     {
-        return m_pLuaZone->m_BattlefieldHandler->GetBattlefieldByInitiator(charID);
+        return m_pLuaZone->battlefieldHandler()->GetBattlefieldByInitiator(charID);
     }
     return nullptr;
 }
 
 auto CLuaZone::getWeather() const -> Weather
 {
-    return m_pLuaZone->GetWeather();
+    return m_pLuaZone->weather().current();
 }
 
 uint32 CLuaZone::getUptime()
diff --git a/src/map/lua/luautils.cpp b/src/map/lua/luautils.cpp
@@ -3589,7 +3589,7 @@ void OnMobDisengage(CBaseEntity* PMob)
         return;
     }
 
-    auto weather = PMob->loc.zone->GetWeather();
+    auto weather = PMob->loc.zone->weather().current();
 
     auto result = onMobDisengage(PMob, weather);
     if (!result.valid())
diff --git a/src/map/packets/c2s/0x0a0_switch_proposal.cpp b/src/map/packets/c2s/0x0a0_switch_proposal.cpp
@@ -34,8 +34,8 @@ auto GP_CLI_COMMAND_SWITCH_PROPOSAL::validate(MapSession* PSession, const CCharE
 
 void GP_CLI_COMMAND_SWITCH_PROPOSAL::process(MapSession* PSession, CCharEntity* PChar) const
 {
-    if (auto* manager = PChar->loc.zone ? PChar->loc.zone->nominateManager() : nullptr)
+    if (PChar->loc.zone)
     {
-        manager->onProposal(PChar, *this);
+        PChar->loc.zone->nominateManager().onProposal(PChar, *this);
     }
 }
diff --git a/src/map/packets/c2s/0x0a1_switch_vote.cpp b/src/map/packets/c2s/0x0a1_switch_vote.cpp
@@ -33,8 +33,8 @@ auto GP_CLI_COMMAND_SWITCH_VOTE::validate(MapSession* PSession, const CCharEntit
 
 void GP_CLI_COMMAND_SWITCH_VOTE::process(MapSession* PSession, CCharEntity* PChar) const
 {
-    if (auto* manager = PChar->loc.zone ? PChar->loc.zone->nominateManager() : nullptr)
+    if (PChar->loc.zone)
     {
-        manager->onVote(PChar, *this);
+        PChar->loc.zone->nominateManager().onVote(PChar, *this);
     }
 }
diff --git a/src/map/packets/s2c/0x00a_login.cpp b/src/map/packets/s2c/0x00a_login.cpp
@@ -151,8 +151,8 @@ GP_SERV_COMMAND_LOGIN::GP_SERV_COMMAND_LOGIN(CCharEntity* PChar, const EventInfo
     };
 
     // TODO: Previous weather
-    packet.WeatherNumber = static_cast<uint16>(PChar->loc.zone->GetWeather());
-    packet.WeatherTime   = PChar->loc.zone->GetWeatherChangeTime();
+    packet.WeatherNumber = static_cast<uint16>(PChar->loc.zone->weather().current());
+    packet.WeatherTime   = PChar->loc.zone->weather().changeTime();
     packet.ZoneNo        = PChar->getZone();
     packet.ZoneSubNo     = PChar->PInstance ? PChar->PInstance->overlayId() : 0;
     packet.MapNumber     = PChar->getZone();
diff --git a/src/map/spawn_handler.cpp b/src/map/spawn_handler.cpp
@@ -37,6 +37,24 @@ SpawnHandler::SpawnHandler(CZone* PZone)
 {
 }
 
+SpawnHandler::~SpawnHandler() = default;
+
+auto SpawnHandler::getOrCreateSpawnSlot(uint32_t slotId) -> SpawnSlot*
+{
+    auto& spawnSlot = spawnSlots_[slotId];
+    if (!spawnSlot)
+    {
+        spawnSlot = std::make_unique<SpawnSlot>();
+    }
+    return spawnSlot.get();
+}
+
+auto SpawnHandler::getSpawnSlot(uint32_t slotId) const -> SpawnSlot*
+{
+    const auto it = spawnSlots_.find(slotId);
+    return it != spawnSlots_.end() ? it->second.get() : nullptr;
+}
+
 // Register a given mob for respawn at its default respawn timer.
 // Respawn timer can optionally be overriden for deaggro/scripting purposes.
 void SpawnHandler::registerForRespawn(CMobEntity* PMob, const Maybe<timer::duration> respawnTime)
@@ -274,7 +292,7 @@ auto SpawnHandler::canSpawnNow(const CMobEntity* PMob) const -> bool
     // Weather-based spawn conditions
     if (PMob->m_SpawnType & SPAWNTYPE_FOG)
     {
-        if (zone_->GetWeather() != Weather::Fog)
+        if (zone_->weather().current() != Weather::Fog)
         {
             return false;
         }
@@ -285,7 +303,7 @@ auto SpawnHandler::canSpawnNow(const CMobEntity* PMob) const -> bool
         // Only for elementals without a master
         if (PMob->m_EcoSystem == xi::Ecosystem::Elemental && PMob->PMaster == nullptr)
         {
-            if (PMob->m_Element != zoneutils::GetWeatherElement(zone_->GetWeather()))
+            if (PMob->m_Element != zoneutils::GetWeatherElement(zone_->weather().current()))
             {
                 return false;
             }
diff --git a/src/map/spawn_handler.h b/src/map/spawn_handler.h
@@ -28,6 +28,8 @@
 
 #include "map_constants.h"
 
+#include <map>
+#include <memory>
 #include <unordered_map>
 
 enum class Weather : uint16_t;
@@ -46,6 +48,13 @@ class SpawnHandler
 {
 public:
     explicit SpawnHandler(CZone* PZone);
+    ~SpawnHandler(); // out-of-line: spawnSlots_ holds unique_ptr to (here) incomplete SpawnSlot
+
+    // Get the spawn slot for slotId, creating it if it doesn't exist yet.
+    auto getOrCreateSpawnSlot(uint32_t slotId) -> SpawnSlot*;
+
+    // Get the spawn slot for slotId, or nullptr if none exists.
+    auto getSpawnSlot(uint32_t slotId) const -> SpawnSlot*;
 
     void Tick(timer::time_point now);
     void registerForRespawn(CMobEntity* PMob, Maybe<timer::duration> respawnTime = std::nullopt);
@@ -62,4 +71,5 @@ class SpawnHandler
     timer::duration                                    spawnWindow_{ kSpawnHandlerWindow };
     std::unordered_map<uint32, timer::time_point>      pendingRespawns_;     // Non-slotted mobs: mobId -> respawnAt timestamp
     std::unordered_map<SpawnSlot*, PendingSlotRespawn> pendingSlotRespawns_; // Slotted mobs: slot pointer -> respawn info
+    std::map<uint32_t, std::unique_ptr<SpawnSlot>>     spawnSlots_;          // Owns this zone's spawn slots, keyed by slot id
 };
diff --git a/src/map/spawn_slot.cpp b/src/map/spawn_slot.cpp
@@ -42,7 +42,7 @@ auto SpawnSlot::TrySpawn(const Maybe<uint32> specificMobId) -> bool
     SpawnHandler* spawnHandler = nullptr;
     if (!entries.empty() && entries[0].mob->loc.zone)
     {
-        spawnHandler = entries[0].mob->loc.zone->spawnHandler();
+        spawnHandler = &entries[0].mob->loc.zone->spawnHandler();
     }
 
     // Check if a specific mob should respawn (deaggro case)
diff --git a/src/map/utils/battleutils.cpp b/src/map/utils/battleutils.cpp
@@ -5039,7 +5039,7 @@ auto GetWeather(CBattleEntity* PEntity, bool ignoreScholar) -> Weather
         return Weather::None;
     }
 
-    return GetWeather(PEntity, ignoreScholar, zoneutils::GetZone(PEntity->getZone())->GetWeather());
+    return GetWeather(PEntity, ignoreScholar, zoneutils::GetZone(PEntity->getZone())->weather().current());
 }
 
 auto GetWeather(CBattleEntity* PEntity, bool ignoreScholar, Weather zoneWeather) -> Weather
diff --git a/src/map/utils/charutils.cpp b/src/map/utils/charutils.cpp
@@ -8052,10 +8052,7 @@ void removeCharFromZone(CCharEntity* PChar)
 
     if (PChar->loc.zone != nullptr)
     {
-        if (auto* manager = PChar->loc.zone->nominateManager())
-        {
-            manager->onCharLeavingZone(PChar);
-        }
+        PChar->loc.zone->nominateManager().onCharLeavingZone(PChar);
     }
 
     PChar->WideScanTarget = std::nullopt;
diff --git a/src/map/utils/fishingutils.cpp b/src/map/utils/fishingutils.cpp
@@ -333,7 +333,7 @@ uint8 GetLuckyMoonModifier()
 
 auto GetWeatherModifier(const CCharEntity* PChar) -> float
 {
-    const auto weather    = zoneutils::GetZone(PChar->getZone())->GetWeather();
+    const auto weather    = zoneutils::GetZone(PChar->getZone())->weather().current();
     float      weatherMod = 1.0f;
 
     if (weather == Weather::Rain)
diff --git a/src/map/utils/zoneutils.cpp b/src/map/utils/zoneutils.cpp
diff --git a/src/map/weather_container.cpp b/src/map/weather_container.cpp
diff --git a/src/map/weather_container.h b/src/map/weather_container.h
diff --git a/src/map/zone.cpp b/src/map/zone.cpp
diff --git a/src/map/zone.h b/src/map/zone.h
diff --git a/src/map/zone_entities.cpp b/src/map/zone_entities.cpp
diff --git a/src/map/zone_instance.h b/src/map/zone_instance.h
diff --git a/src/test/lua/lua_simulation.cpp b/src/test/lua/lua_simulation.cpp

Original file line number	Diff line number	Diff line change
`@@ -1178,7 +1178,7 @@ auto CMobController::DoRoamTick(timer::time_point tick) -> Task<void>`
`1178`	`1178`	`{`
`1179`	`1179`	`PMob->PAI->Despawn();`
`1180`	`1180`	`// Override respawn timer set by CDespawnState for deaggro (60s instead of default)`
`1181`		`- PMob->loc.zone->spawnHandler()->registerForRespawn(PMob, 60s);`
	`1181`	`+ PMob->loc.zone->spawnHandler().registerForRespawn(PMob, 60s);`
`1182`	`1182`	`co_return;`
`1183`	`1183`	`}`
`1184`	`1184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ CDespawnState::CDespawnState(CBaseEntity* _PEntity, bool instantDespawn)`
`39`	`39`
`40`	`40`	`if (auto* PMob = dynamic_cast<CMobEntity*>(_PEntity); PMob && PMob->m_AllowRespawn && PMob->loc.zone != nullptr)`
`41`	`41`	`{`
`42`		`- PMob->loc.zone->spawnHandler()->registerForRespawn(PMob);`
	`42`	`+ PMob->loc.zone->spawnHandler().registerForRespawn(PMob);`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -844,7 +844,7 @@ auto CMobEntity::GetEligibleGeodes() const -> std::vector<uint16>`
`844`	`844`	`uint8 element = 0;`
`845`	`845`
`846`	`846`	`// Set element by weather`
`847`		`- if (const Weather weather = loc.zone->GetWeather(); weather >= Weather::HotSpell && weather <= Weather::Darkness)`
	`847`	`+ if (const Weather weather = loc.zone->weather().current(); weather >= Weather::HotSpell && weather <= Weather::Darkness)`
`848`	`848`	`{`
`849`	`849`	`/*`
`850`	`850`	`element = zoneutils::GetWeatherElement(weather);`
Original file line number	Diff line number	Diff line change
`@@ -702,7 +702,7 @@ void CLatentEffectContainer::CheckLatentsWeather()`
`702`	`702`	`return;`
`703`	`703`	`}`
`704`	`704`
`705`		`- CheckLatentsWeather(PZone->GetWeather());`
	`705`	`+ CheckLatentsWeather(PZone->weather().current());`
`706`	`706`	`}`
`707`	`707`
`708`	`708`	`void CLatentEffectContainer::CheckLatentsWeather(Weather weather)`
Original file line number	Diff line number	Diff line change
`@@ -2631,7 +2631,7 @@ auto CLuaBaseEntity::getWeather(const sol::object& ignoreScholar) const -> uint8`
`2631`	`2631`	`}`
`2632`	`2632`	`else`
`2633`	`2633`	`{`
`2634`		`- weather = zoneutils::GetZone(m_PBaseEntity->getZone())->GetWeather();`
	`2634`	`+ weather = zoneutils::GetZone(m_PBaseEntity->getZone())->weather().current();`
`2635`	`2635`	`}`
`2636`	`2636`
`2637`	`2637`	`return static_cast<uint8>(weather);`
`@@ -12266,7 +12266,7 @@ auto CLuaBaseEntity::registerBattlefield(const sol::object& arg0, const sol::obj`
`12266`	`12266`	`return BATTLEFIELD_RETURN_CODE_BATTLEFIELD_FULL;`
`12267`	`12267`	`}`
`12268`	`12268`
`12269`		`- if (m_PBaseEntity->loc.zone->m_BattlefieldHandler == nullptr)`
	`12269`	`+ if (m_PBaseEntity->loc.zone->battlefieldHandler() == nullptr)`
`12270`	`12270`	`{`
`12271`	`12271`	`ShowWarning("m_BattlefieldHandler was null for %s.", m_PBaseEntity->getName());`
`12272`	`12272`	`return BATTLEFIELD_RETURN_CODE_BATTLEFIELD_FULL;`
`@@ -12317,7 +12317,7 @@ auto CLuaBaseEntity::registerBattlefield(const sol::object& arg0, const sol::obj`
`12317`	`12317`	`registration.rules \|= battlefield.get<bool>("canLoseExp") ? RULES_LOSE_EXP : 0;`
`12318`	`12318`	`}`
`12319`	`12319`
`12320`		`- return PZone->m_BattlefieldHandler->RegisterBattlefield(PChar, registration);`
	`12320`	`+ return PZone->battlefieldHandler()->RegisterBattlefield(PChar, registration);`
`12321`	`12321`	`}`
`12322`	`12322`
`12323`	`12323`	`auto CLuaBaseEntity::battlefieldAtCapacity(const int battlefieldID) const -> bool`
`@@ -12328,7 +12328,7 @@ auto CLuaBaseEntity::battlefieldAtCapacity(const int battlefieldID) const -> boo`
`12328`	`12328`	`return true;`
`12329`	`12329`	`}`
`12330`	`12330`
`12331`		`- if (m_PBaseEntity->loc.zone->m_BattlefieldHandler == nullptr)`
	`12331`	`+ if (m_PBaseEntity->loc.zone->battlefieldHandler() == nullptr)`
`12332`	`12332`	`{`
`12333`	`12333`	`ShowWarning("m_BattlefieldHandler was null for %s.", m_PBaseEntity->getName());`
`12334`	`12334`	`return true;`
`@@ -12343,14 +12343,14 @@ auto CLuaBaseEntity::battlefieldAtCapacity(const int battlefieldID) const -> boo`
`12343`	`12343`	`auto* PChar = static_cast<CCharEntity*>(m_PBaseEntity);`
`12344`	`12344`	`auto* PZone = PChar->loc.zone == nullptr ? zoneutils::GetZone(PChar->loc.destination) : PChar->loc.zone;`
`12345`	`12345`
`12346`		`- if (!PZone \|\| PZone->m_BattlefieldHandler == nullptr)`
	`12346`	`+ if (!PZone \|\| PZone->battlefieldHandler() == nullptr)`
`12347`	`12347`	`{`
`12348`	`12348`	`ShowWarning("CLuaBaseEntity::battlefieldAtCapacity() - Battlefield Handler is null.");`
`12349`	`12349`	`return true; // NOTE: We were previously breaking here, so return full in this case.`
`12350`	`12350`	`}`
`12351`	`12351`
`12352`	`12352`	`bool full = false;`
`12353`		`- if (PZone->m_BattlefieldHandler->ReachedMaxCapacity(battlefieldID))`
	`12353`	`+ if (PZone->battlefieldHandler()->ReachedMaxCapacity(battlefieldID))`
`12354`	`12354`	`{`
`12355`	`12355`	`full = true;`
`12356`	`12356`	`}`
`@@ -12373,7 +12373,7 @@ auto CLuaBaseEntity::enterBattlefield(const sol::object& area) const -> bool`
`12373`	`12373`	`return false;`
`12374`	`12374`	`}`
`12375`	`12375`
`12376`		`- if (m_PBaseEntity->objtype != TYPE_PC \|\| m_PBaseEntity->loc.zone->m_BattlefieldHandler == nullptr)`
	`12376`	`+ if (m_PBaseEntity->objtype != TYPE_PC \|\| m_PBaseEntity->loc.zone->battlefieldHandler() == nullptr)`
`12377`	`12377`	`{`
`12378`	`12378`	`ShowWarning("CLuaBaseEntity::enterBattlefield() - Non-PC calling function, or Battlefield Handler is null.");`
`12379`	`12379`	`return false;`
`@@ -12382,11 +12382,11 @@ auto CLuaBaseEntity::enterBattlefield(const sol::object& area) const -> bool`
`12382`	`12382`	`CBattlefield* PBattlefield = nullptr;`
`12383`	`12383`	`if (area == sol::lua_nil)`
`12384`	`12384`	`{`
`12385`		`- PBattlefield = m_PBaseEntity->loc.zone->m_BattlefieldHandler->GetBattlefield(m_PBaseEntity, true);`
	`12385`	`+ PBattlefield = m_PBaseEntity->loc.zone->battlefieldHandler()->GetBattlefield(m_PBaseEntity, true);`
`12386`	`12386`	`}`
`12387`	`12387`	`else`
`12388`	`12388`	`{`
`12389`		`- PBattlefield = m_PBaseEntity->loc.zone->m_BattlefieldHandler->GetBattlefieldByArea(area.as<uint8>());`
	`12389`	`+ PBattlefield = m_PBaseEntity->loc.zone->battlefieldHandler()->GetBattlefieldByArea(area.as<uint8>());`
`12390`	`12390`	`}`
`12391`	`12391`
`12392`	`12392`	`return PBattlefield ? PBattlefield->InsertEntity(m_PBaseEntity, true) : false;`
`@@ -12407,13 +12407,13 @@ auto CLuaBaseEntity::leaveBattlefield(const uint8 leavecode) const -> bool`
`12407`	`12407`	`return false;`
`12408`	`12408`	`}`
`12409`	`12409`
`12410`		`- if (m_PBaseEntity->objtype == TYPE_NPC \|\| m_PBaseEntity->loc.zone->m_BattlefieldHandler == nullptr)`
	`12410`	`+ if (m_PBaseEntity->objtype == TYPE_NPC \|\| m_PBaseEntity->loc.zone->battlefieldHandler() == nullptr)`
`12411`	`12411`	`{`
`12412`	`12412`	`ShowWarning("CLuaBaseEntity::leaveBattlefield() - NPC calling function, or Battlefield Handler is null.");`
`12413`	`12413`	`return false;`
`12414`	`12414`	`}`
`12415`	`12415`
`12416`		`- return m_PBaseEntity->loc.zone->m_BattlefieldHandler->RemoveFromBattlefield(m_PBaseEntity, m_PBaseEntity->PBattlefield, leavecode);`
	`12416`	`+ return m_PBaseEntity->loc.zone->battlefieldHandler()->RemoveFromBattlefield(m_PBaseEntity, m_PBaseEntity->PBattlefield, leavecode);`
`12417`	`12417`	`}`
`12418`	`12418`
`12419`	`12419`	`/************************************************************************`
`@@ -18009,7 +18009,7 @@ auto CLuaBaseEntity::getRespawnTime() const -> uint32`
`18009`	`18009`
`18010`	`18010`	`if (auto* PMob = static_cast<CMobEntity*>(m_PBaseEntity); PMob->loc.zone)`
`18011`	`18011`	`{`
`18012`		`- if (const auto remaining = PMob->loc.zone->spawnHandler()->getRemainingRespawnTime(PMob))`
	`18012`	`+ if (const auto remaining = PMob->loc.zone->spawnHandler().getRemainingRespawnTime(PMob))`
`18013`	`18013`	`{`
`18014`	`18014`	`return static_cast<uint32>(timer::count_seconds(*remaining));`
`18015`	`18015`	`}`
`@@ -18041,7 +18041,7 @@ void CLuaBaseEntity::setRespawnTime(const uint32 seconds) const`
`18041`	`18041`
`18042`	`18042`	`if (PMob->loc.zone != nullptr)`
`18043`	`18043`	`{`
`18044`		`- PMob->loc.zone->spawnHandler()->unregister(PMob);`
	`18044`	`+ PMob->loc.zone->spawnHandler().unregister(PMob);`
`18045`	`18045`	`}`
`18046`	`18046`
`18047`	`18047`	`return;`
`@@ -18053,7 +18053,7 @@ void CLuaBaseEntity::setRespawnTime(const uint32 seconds) const`
`18053`	`18053`	`// If mob is not currently spawned, update its pending respawn time in SpawnHandler`
`18054`	`18054`	`if (!PMob->PAI->IsSpawned() && PMob->loc.zone != nullptr)`
`18055`	`18055`	`{`
`18056`		`- PMob->loc.zone->spawnHandler()->registerForRespawn(PMob, std::chrono::seconds(seconds));`
	`18056`	`+ PMob->loc.zone->spawnHandler().registerForRespawn(PMob, std::chrono::seconds(seconds));`
`18057`	`18057`	`}`
`18058`	`18058`	`}`
`18059`	`18059`
Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ void CLuaBattlefield::addGroups(const sol::table& groups, bool hasMultipleArenas`
`330`	`330`
`331`	`331`	`if (!entityIds.empty())`
`332`	`332`	`{`
`333`		`- uint32 stride = uint32(entityIds.size()) / m_PLuaBattlefield->GetZone()->m_BattlefieldHandler->MaxBattlefieldAreas();`
	`333`	`+ uint32 stride = uint32(entityIds.size()) / m_PLuaBattlefield->GetZone()->battlefieldHandler()->MaxBattlefieldAreas();`
`334`	`334`
`335`	`335`	`// Look to see if there's an Armoury Crate within the group of monsters`
`336`	`336`	`static const std::string ARMOURY_CRATE = "Armoury_Crate";`
Original file line number	Diff line number	Diff line change
`@@ -188,16 +188,16 @@ ZONE_TYPE CLuaZone::getTypeMask()`
`188`	`188`
`189`	`189`	`auto CLuaZone::getBattlefieldByInitiator(uint32 charID) -> CBattlefield*`
`190`	`190`	`{`
`191`		`- if (m_pLuaZone->m_BattlefieldHandler)`
	`191`	`+ if (m_pLuaZone->battlefieldHandler())`
`192`	`192`	`{`
`193`		`- return m_pLuaZone->m_BattlefieldHandler->GetBattlefieldByInitiator(charID);`
	`193`	`+ return m_pLuaZone->battlefieldHandler()->GetBattlefieldByInitiator(charID);`
`194`	`194`	`}`
`195`	`195`	`return nullptr;`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`auto CLuaZone::getWeather() const -> Weather`
`199`	`199`	`{`
`200`		`- return m_pLuaZone->GetWeather();`
	`200`	`+ return m_pLuaZone->weather().current();`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`uint32 CLuaZone::getUptime()`
Original file line number	Diff line number	Diff line change
`@@ -3589,7 +3589,7 @@ void OnMobDisengage(CBaseEntity* PMob)`
`3589`	`3589`	`return;`
`3590`	`3590`	`}`
`3591`	`3591`
`3592`		`- auto weather = PMob->loc.zone->GetWeather();`
	`3592`	`+ auto weather = PMob->loc.zone->weather().current();`
`3593`	`3593`
`3594`	`3594`	`auto result = onMobDisengage(PMob, weather);`
`3595`	`3595`	`if (!result.valid())`