Reset timers on map change

Mikusch · Feb 27, 2025 · 0874dd6 · 0874dd6
1 parent c91ef85
commit 0874dd6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/addons/sourcemod/scripting/mitm.sp b/addons/sourcemod/scripting/mitm.sp
@@ -241,7 +241,7 @@ public void OnMapStart()
 	g_bInWaitingForPlayers = false;
 
 	Precache();
-	DHooks_HookGameRules();
+	DHooks_OnMapStart();
 }
 
 public void VScript_OnScriptVMInitialized()

diff --git a/addons/sourcemod/scripting/mitm/dhooks.sp b/addons/sourcemod/scripting/mitm/dhooks.sp
@@ -138,6 +138,15 @@ void DHooks_VScriptInit()
 	DHooks_CreateScriptDetour(NULL_STRING, "IsPlayerABot", DHookCallback_IsPlayerABot_Pre);
 }
 
+void DHooks_OnMapStart()
+{
+	m_cooldownTimer.Invalidate();
+	m_checkForDangerousSentriesTimer.Invalidate();
+
+	if (g_hDHook_CTeamplayRoundBasedRules_RespawnPlayers)
+		PSM_DHookGameRules(g_hDHook_CTeamplayRoundBasedRules_RespawnPlayers, Hook_Pre, DHookCallback_CTFGameRules_RespawnPlayers_Pre);
+}
+
 void DHooks_OnEntityCreated(int entity, const char[] classname)
 {
 	if (IsEntityClient(entity))
@@ -195,12 +204,6 @@ void DHooks_OnEntityCreated(int entity, const char[] classname)
 	}
 }
 
-void DHooks_HookGameRules()
-{
-	if (g_hDHook_CTeamplayRoundBasedRules_RespawnPlayers)
-		PSM_DHookGameRules(g_hDHook_CTeamplayRoundBasedRules_RespawnPlayers, Hook_Pre, DHookCallback_CTFGameRules_RespawnPlayers_Pre);
-}
-
 static void DHooks_CopyScriptFunctionBinding(const char[] sourceClassName, const char[] functionName, const char[] targetClassName, DHookCallback callbackPre = INVALID_FUNCTION, DHookCallback callbackPost = INVALID_FUNCTION, bool bEmpty = true)
 {
 	VScriptFunction pTargetFunc = VScript_GetClassFunction(targetClassName, functionName);