From 6fe2750545d49406b0d83c199cf0f19506af5967 Mon Sep 17 00:00:00 2001
From: Atony <75191600+AtonyGit@users.noreply.github.com>
Date: Wed, 12 Aug 2026 23:18:00 -0500
Subject: [PATCH] Make kill timer use whatever the gamemode sets

---
 MiraAPI/Networking/CustomMurderRpc.cs   | 10 ++++++++--
 MiraAPI/Patches/GameModes/HudPatches.cs |  7 +++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/MiraAPI/Networking/CustomMurderRpc.cs b/MiraAPI/Networking/CustomMurderRpc.cs
index 70098194..716a8ec9 100644
--- a/MiraAPI/Networking/CustomMurderRpc.cs
+++ b/MiraAPI/Networking/CustomMurderRpc.cs
@@ -7,6 +7,7 @@ using Assets.CoreScripts;
 using BepInEx.Unity.IL2CPP.Utils;
 using MiraAPI.Events;
 using MiraAPI.Events.Vanilla.Gameplay;
+using MiraAPI.GameModes;
 using MiraAPI.Utilities;
 using Reactor.Networking.Attributes;
 using Reactor.Networking.Rpc;
@@ -209,7 +210,10 @@ public static class CustomMurderRpc
                 if (resetKillTimer)
                 {
                     source.SetKillTimer(
-                        GameOptionsManager.Instance.CurrentGameOptions.GetFloat(FloatOptionNames.KillCooldown) / 2f);
+                        CustomGameModeManager.ActiveMode != null
+                            ? CustomGameModeManager.ActiveMode.DefaultImpostorKillCooldown / 2f
+                            : GameOptionsManager.Instance.CurrentGameOptions.GetFloat(FloatOptionNames.KillCooldown) /
+                              2f);
                 }
             }
             else
@@ -246,7 +250,9 @@ public static class CustomMurderRpc
 
             if (resetKillTimer)
             {
-                source.SetKillTimer(GameOptionsManager.Instance.CurrentGameOptions.GetFloat(FloatOptionNames.KillCooldown));
+                source.SetKillTimer(CustomGameModeManager.ActiveMode != null
+                    ? CustomGameModeManager.ActiveMode.DefaultImpostorKillCooldown
+                    : GameOptionsManager.Instance.CurrentGameOptions.GetFloat(FloatOptionNames.KillCooldown));
             }
         }
 
diff --git a/MiraAPI/Patches/GameModes/HudPatches.cs b/MiraAPI/Patches/GameModes/HudPatches.cs
index 77c0f487..735d1986 100644
--- a/MiraAPI/Patches/GameModes/HudPatches.cs
+++ b/MiraAPI/Patches/GameModes/HudPatches.cs
@@ -16,8 +16,11 @@ internal static class HudPatches
     [HarmonyPostfix, HarmonyPatch(nameof(HudManager.Update))]
     public static void HudUpdatePatch(HudManager __instance)
     {
-        if (GameManager.Instance != null && GameManager.Instance.GameHasStarted)
-            CustomGameModeManager.ActiveMode?.HudUpdate(__instance);
+        if (GameManager.Instance != null && GameManager.Instance.GameHasStarted &&
+            CustomGameModeManager.ActiveMode != null)
+        {
+            CustomGameModeManager.ActiveMode.HudUpdate(__instance);
+        }
     }