[Release] 22.44.4 (#4074)

### Fixes

* Fix ClearSpawnTimers() ([#4073](https://github.com/EQEmu/Server/pull/4073)) @Kinglykrab 2024-02-13

CHANGELOG.md

@@ -1,3 +1,15 @@
+## [22.44.4] - 2/12/2024
+
+### Fixes
+
+* Fix ClearSpawnTimers() ([#4073](https://github.com/EQEmu/Server/pull/4073)) @Kinglykrab 2024-02-13
+
+## [22.44.3] - 2/12/2024
+
+### Fixes
+
+* Fix Issue with ClearSpawnTimers() ([#4070](https://github.com/EQEmu/Server/pull/4070)) @Kinglykrab 2024-02-13
+
 ## [22.44.2] - 2/12/2024
 
 ### Bots

common/version.h

@@ -25,7 +25,7 @@
 
 // Build variables
 // these get injected during the build pipeline
-#define CURRENT_VERSION "22.44.2-dev" // always append -dev to the current version for custom-builds
+#define CURRENT_VERSION "22.44.4-dev" // always append -dev to the current version for custom-builds
 #define LOGIN_VERSION "0.8.0"
 #define COMPILE_DATE    __DATE__
 #define COMPILE_TIME    __TIME__

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eqemu-server",
-  "version": "22.44.2",
+  "version": "22.44.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/EQEmu/Server.git"

zone/zone.cpp

@@ -1898,6 +1898,10 @@ void Zone::Repop(bool is_forced)
 		return;
 	}
 
+	if (is_forced) {
+		ClearSpawnTimers();
+	}
+
 	LinkedListIterator<Spawn2 *> 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();
@@ -2649,22 +2649,24 @@ void Zone::ClearSpawnTimers()
 
 	iterator.Reset();
 
-	std::vector<std::string> respawn_ids;
+	std::vector<uint32> respawn_ids;
 
 	while (iterator.MoreElements()) {
-		respawn_ids.emplace_back(std::to_string(iterator.GetData()->GetID()));
+		respawn_ids.emplace_back(iterator.GetData()->spawn2_id);
 
 		iterator.Advance();
 	}
 
-	RespawnTimesRepository::DeleteWhere(
-		database,
-		fmt::format(
-			"`instance_id` = {} AND `id` IN ({})",
-			GetInstanceID(),
-			Strings::Implode(", ", respawn_ids)
-		)
-	);
+	if (!respawn_ids.empty()) {
+		RespawnTimesRepository::DeleteWhere(
+			database,
+			fmt::format(
+				"`instance_id` = {} AND `id` IN ({})",
+				GetInstanceID(),
+				Strings::Join(respawn_ids, ", ")
+			)
+		);
+	}
 }
 
 uint32 Zone::GetSpawnKillCount(uint32 in_spawnid) {