From 43c7523ee169c17b8fa71c7238217214d4a95190 Mon Sep 17 00:00:00 2001 From: Alex King <89047260+Kinglykrab@users.noreply.github.com> Date: Mon, 12 Feb 2024 21:12:30 -0500 Subject: [PATCH] [Hotfix] Fix ClearSpawnTimers() (#4073) # Notes - This wasn't a part of my other pull request. - We were clearing `spawn2_list` before using it in `ClearSpawnTimers()`. --- zone/zone.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zone/zone.cpp b/zone/zone.cpp index 1bb71727b..41f513602 100644 --- a/zone/zone.cpp +++ b/zone/zone.cpp @@ -1898,6 +1898,10 @@ void Zone::Repop(bool is_forced) return; } + if (is_forced) { + ClearSpawnTimers(); + } + LinkedListIterator iterator(spawn2_list); iterator.Reset(); @@ -1905,10 +1909,6 @@ void Zone::Repop(bool is_forced) iterator.RemoveCurrent(); } - if (is_forced) { - ClearSpawnTimers(); - } - npc_scale_manager->LoadScaleData(); entity_list.ClearTrapPointers();