Merge remote-tracking branch 'origin/main'

This commit is contained in:
Gurge44 committed 2026-03-02 08:58:32 +01:00
commit c3f1a1349c
2 files changed
+1 -4

No files matched your search

+1 -1
View File
@@ -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,
-3
View File
@@ -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;