From 3cec1cf129b183cb6101e310cc0d4b5fe2e7bbe1 Mon Sep 17 00:00:00 2001
From: sruon <sruon@users.noreply.github.com>
Date: Mon, 19 Jan 2026 08:37:25 -0700
Subject: [PATCH 1/2] Persist spawn timers during zone sleep

---
 src/map/zone.cpp | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/map/zone.cpp b/src/map/zone.cpp
index 0ceb56b0dac..971555650c1 100644
--- a/src/map/zone.cpp
+++ b/src/map/zone.cpp
@@ -846,12 +846,6 @@ void CZone::ZoneServer(timer::time_point tick)
 
         ZoneTimerTriggerAreas->m_type = CTaskManager::TASK_REMOVE;
         ZoneTimerTriggerAreas         = nullptr;
-
-        if (SpawnHandlerTimer)
-        {
-            SpawnHandlerTimer->m_type = CTaskManager::TASK_REMOVE;
-            SpawnHandlerTimer         = nullptr;
-        }
     }
 }
 
@@ -960,14 +954,16 @@ void CZone::createZoneTimers()
         return 0;
     });
 
-    SpawnHandlerTimer = CTaskManager::getInstance()->AddTask(m_zoneName + "_SpawnHandler", timer::now(), this, CTaskManager::TASK_INTERVAL, kSpawnHandlerInterval,
-    [](const timer::time_point tick, const CTaskManager::CTask* PTask)
+    if (!SpawnHandlerTimer)
     {
-        const auto*  PZone = std::any_cast<CZone*>(PTask->m_data);
-        PZone->spawnHandler()->Tick(tick);
-        return 0;
-    });
-    // clang-format on
+        SpawnHandlerTimer = CTaskManager::getInstance()->AddTask(m_zoneName + "_SpawnHandler", timer::now(), this, CTaskManager::TASK_INTERVAL, kSpawnHandlerInterval,
+        [](const timer::time_point tick, const CTaskManager::CTask* PTask)
+        {
+            const auto*  PZone = std::any_cast<CZone*>(PTask->m_data);
+            PZone->spawnHandler()->Tick(tick);
+            return 0;
+        });
+    }
 }
 
 void CZone::CharZoneIn(CCharEntity* PChar)

From 8c7dc2f4fc11071594bd8a91f28a80f601e4528d Mon Sep 17 00:00:00 2001
From: sruon <sruon@users.noreply.github.com>
Date: Mon, 19 Jan 2026 09:57:27 -0700
Subject: [PATCH 2/2] Create spawn task on zone instantiation

---
 src/map/spawn_handler.cpp   | 15 +++++++++++++++
 src/map/spawn_handler.h     |  1 +
 src/map/utils/zoneutils.cpp | 12 +++++++++---
 src/map/zone.cpp            | 18 +++++++-----------
 4 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/map/spawn_handler.cpp b/src/map/spawn_handler.cpp
index 54b3ea88d6e..bbcd5e1c827 100644
--- a/src/map/spawn_handler.cpp
+++ b/src/map/spawn_handler.cpp
@@ -58,6 +58,21 @@ void SpawnHandler::registerForRespawn(CMobEntity* PMob, const std::optional<time
     }
 }
 
+auto SpawnHandler::isRegistered(CMobEntity* PMob) const -> bool
+{
+    if (!PMob)
+    {
+        return false;
+    }
+
+    if (SpawnSlot* slot = PMob->GetSpawnSlot())
+    {
+        return pendingSlotRespawns_.contains(slot);
+    }
+
+    return pendingRespawns_.contains(PMob->id);
+}
+
 // Every 30 seconds, attempt to spawn any mob pending respawn.
 // Mobs are respawned if:
 // - Their respawn timer is due within the next 15s (half interval)
diff --git a/src/map/spawn_handler.h b/src/map/spawn_handler.h
index 84d5d65c409..a31905ee3d7 100644
--- a/src/map/spawn_handler.h
+++ b/src/map/spawn_handler.h
@@ -48,6 +48,7 @@ class SpawnHandler
 
     void Tick(timer::time_point now);
     void registerForRespawn(CMobEntity* PMob, std::optional<timer::duration> respawnTime = std::nullopt);
+    auto isRegistered(CMobEntity* PMob) const -> bool;
     void onTOTDChange(vanadiel_time::TOTD totd) const;
     void onWeatherChange(Weather weather) const;
     auto canSpawnNow(const CMobEntity* PMob) const -> bool;
diff --git a/src/map/utils/zoneutils.cpp b/src/map/utils/zoneutils.cpp
index d4ba20db85b..84cbd4b0bc4 100644
--- a/src/map/utils/zoneutils.cpp
+++ b/src/map/utils/zoneutils.cpp
@@ -709,8 +709,12 @@ void LoadMOBList(const std::vector<uint16>& zoneIds)
             PZone->ForEachMob(
                 [&PZone](CMobEntity* PMob)
                 {
-                    // PMob->m_AllowRespawn initializes as false, so if it's true then mob:setRespawnTime was executed in OnMobInitialize
-                    // This makes mob:setRespawnTime(X) behave consistently, making the mob spawn X seconds in the future
+                    // Skip mobs already registered via setRespawnTime in onMobInitialize - let SpawnHandler handle them
+                    if (PZone->spawnHandler()->isRegistered(PMob))
+                    {
+                        return;
+                    }
+
                     if (PMob->m_CanSpawn && PMob->m_AllowRespawn)
                     {
                         PMob->m_AllowRespawn = true;
@@ -724,7 +728,9 @@ void LoadMOBList(const std::vector<uint16>& zoneIds)
                             PMob->m_AllowRespawn = true;
                         }
 
-                        PZone->spawnHandler()->registerForRespawn(PMob);
+                        // Condition-based mobs (time/weather) register with 0s so they spawn when conditions are met
+                        const bool isConditionBased = PMob->m_SpawnType & (SPAWNTYPE_ATNIGHT | SPAWNTYPE_ATEVENING | SPAWNTYPE_WEATHER | SPAWNTYPE_FOG);
+                        PZone->spawnHandler()->registerForRespawn(PMob, isConditionBased ? std::make_optional(0s) : std::nullopt);
                     }
                 });
         });
diff --git a/src/map/zone.cpp b/src/map/zone.cpp
index 971555650c1..dff84f1c234 100644
--- a/src/map/zone.cpp
+++ b/src/map/zone.cpp
@@ -95,6 +95,13 @@ CZone::CZone(ZONEID ZoneID, REGION_TYPE RegionID, CONTINENT_TYPE ContinentID, ui
     LoadZoneLines();
     LoadZoneWeather();
 
+    SpawnHandlerTimer = CTaskManager::getInstance()->AddTask(m_zoneName + "_SpawnHandler", timer::now(), this, CTaskManager::TASK_INTERVAL, kSpawnHandlerInterval, [](const timer::time_point tick, const CTaskManager::CTask* PTask)
+                                                             {
+                                                                 const auto* PZone = std::any_cast<CZone*>(PTask->m_data);
+                                                                 PZone->spawnHandler()->Tick(tick);
+                                                                 return 0;
+                                                             });
+
     // NOTE: Heavy resources like Navmesh are now loaded outside of the constructor in zoneutils::LoadZoneList
 }
 
@@ -953,17 +960,6 @@ void CZone::createZoneTimers()
         PZone->CheckTriggerAreas();
         return 0;
     });
-
-    if (!SpawnHandlerTimer)
-    {
-        SpawnHandlerTimer = CTaskManager::getInstance()->AddTask(m_zoneName + "_SpawnHandler", timer::now(), this, CTaskManager::TASK_INTERVAL, kSpawnHandlerInterval,
-        [](const timer::time_point tick, const CTaskManager::CTask* PTask)
-        {
-            const auto*  PZone = std::any_cast<CZone*>(PTask->m_data);
-            PZone->spawnHandler()->Tick(tick);
-            return 0;
-        });
-    }
 }
 
 void CZone::CharZoneIn(CCharEntity* PChar)