From f363b1c7079fac0836cd22d9bc4342c7bf47d492 Mon Sep 17 00:00:00 2001
From: TommyXL <104814436+Tommy-XL@users.noreply.github.com>
Date: Mon, 2 Mar 2026 15:35:12 +0800
Subject: [PATCH] Fix FFA CheckMurder (#510)

---
 Modules/ExtendedPlayerControl.cs | 2 +-
 Patches/IntroPatch.cs            | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Modules/ExtendedPlayerControl.cs b/Modules/ExtendedPlayerControl.cs
index 6861d5ccc..c396153f1 100644
--- a/Modules/ExtendedPlayerControl.cs
+++ b/Modules/ExtendedPlayerControl.cs
@@ -1502,7 +1502,7 @@ internal static class ExtendedPlayerControl
         return Options.CurrentGameMode switch
         {
             CustomGameMode.SoloPVP => SoloPVP.CanVent,
-            CustomGameMode.FFA => !(FreeForAll.FFADisableVentingWhenKcdIsUp.GetBool() && Main.KillTimers[pc.PlayerId] <= 0) && !(FreeForAll.FFADisableVentingWhenTwoPlayersAlive.GetBool() && Main.AllAlivePlayerControls.Count <= 2),
+            CustomGameMode.FFA => !(FreeForAll.FFADisableVentingWhenKcdIsUp.GetBool() && Main.KillTimers.GetValueOrDefault(pc.PlayerId) <= 0) && !(FreeForAll.FFADisableVentingWhenTwoPlayersAlive.GetBool() && Main.AllAlivePlayerControls.Count <= 2),
             CustomGameMode.StopAndGo => false,
             CustomGameMode.HotPotato => false,
             CustomGameMode.Speedrun => false,
diff --git a/Patches/IntroPatch.cs b/Patches/IntroPatch.cs
index 3fa379c3a..89d04cfa5 100644
--- a/Patches/IntroPatch.cs
+++ b/Patches/IntroPatch.cs
@@ -1318,9 +1318,6 @@ internal static class IntroCutsceneDestroyPatch
                 case CustomGameMode.Standard:
                     Blessed.AfterMeetingTasks();
                     break;
-                case CustomGameMode.FFA:
-                    LateTask.New(() => Main.EnumerateAlivePlayerControls().Do(x => x.RpcSetRoleDesync(RoleTypes.Impostor, x.OwnerId)), 6f);
-                    break;
                 case CustomGameMode.KingOfTheZones:
                     Main.Instance.StartCoroutine(KingOfTheZones.GameStart());
                     break;