From ae18b77e8361a41c25e9b97812c7a4ab97715bb4 Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Sun, 23 Mar 2025 14:42:24 -0500
Subject: [PATCH] [DZ] Clear Respawn Timers on Creation

---
 common/dynamic_zone_base.cpp | 14 ++++++++++++++
 common/dynamic_zone_base.h   |  1 +
 2 files changed, 15 insertions(+)

diff --git a/common/dynamic_zone_base.cpp b/common/dynamic_zone_base.cpp
index e4a146b41..d622cfa1e 100644
--- a/common/dynamic_zone_base.cpp
+++ b/common/dynamic_zone_base.cpp
@@ -8,6 +8,7 @@
 #include "repositories/dynamic_zone_lockouts_repository.h"
 #include "repositories/instance_list_repository.h"
 #include "repositories/instance_list_player_repository.h"
+#include "repositories/respawn_times_repository.h"
 
 DynamicZoneBase::DynamicZoneBase(DynamicZonesRepository::DynamicZoneInstance&& entry)
 {
@@ -68,6 +69,8 @@ uint32_t DynamicZoneBase::CreateInstance()
 
 	m_instance_id = instance.id;
 
+	ClearInstanceRespawnTimers();
+
 	return m_instance_id;
 }
 
@@ -876,3 +879,14 @@ void DynamicZoneBase::SyncCharacterLockouts(uint32_t char_id, std::vector<DzLock
 		CharacterExpeditionLockoutsRepository::InsertLockouts(GetDatabase(), char_id, lockouts);
 	}
 }
+
+void DynamicZoneBase::ClearInstanceRespawnTimers()
+{
+	RespawnTimesRepository::DeleteWhere(
+		GetDatabase(),
+		fmt::format(
+			"`instance_id` = {}",
+			GetInstanceID()
+		)
+	);
+}
diff --git a/common/dynamic_zone_base.h b/common/dynamic_zone_base.h
index 6a43449f4..902f85c36 100644
--- a/common/dynamic_zone_base.h
+++ b/common/dynamic_zone_base.h
@@ -195,6 +195,7 @@ protected:
 	void AddInternalMember(const DynamicZoneMember& member);
 	uint32_t Create();
 	uint32_t CreateInstance();
+	void ClearInstanceRespawnTimers();
 	void LoadRepositoryResult(DynamicZonesRepository::DynamicZoneInstance&& dz_entry);
 	void RemoveInternalMember(uint32_t character_id);
 	void SaveMembers(const std::vector<DynamicZoneMember>& members);