diff --git a/Modules/ExtendedPlayerControl.cs b/Modules/ExtendedPlayerControl.cs index 10b30129f..0d476c451 100644 --- a/Modules/ExtendedPlayerControl.cs +++ b/Modules/ExtendedPlayerControl.cs @@ -1267,7 +1267,7 @@ internal static class ExtendedPlayerControl public static bool CanUseKillButton(this PlayerControl pc) { - if (AntiBlackout.SkipTasks || TimeMaster.Rewinding || !pc.IsAlive()) return false; + if (AntiBlackout.SkipTasks || TimeMaster.Rewinding || !Main.IntroDestroyed || !pc.IsAlive()) return false; switch (Options.CurrentGameMode) { diff --git a/Patches/TaskAssignPatch.cs b/Patches/TaskAssignPatch.cs index 0ef3e88e9..292b85955 100644 --- a/Patches/TaskAssignPatch.cs +++ b/Patches/TaskAssignPatch.cs @@ -273,7 +273,7 @@ internal static class RpcSetTasksPatch PlayerTask GetTaskFromTaskType(TaskTypes type) => allTasks.FirstOrDefault(t => t.TaskType == type); } - catch (Exception e) { Utils.ThrowException(e); } + catch { } #endregion }