From 9884b40b05ea77fbb66028921b9cfc03c7125073 Mon Sep 17 00:00:00 2001
From: Gurge44 <gurge44.minecraft@gmail.com>
Date: Wed, 2 Apr 2025 17:52:09 +0200
Subject: [PATCH] a

---
 Modules/ExtendedPlayerControl.cs | 2 +-
 Patches/TaskAssignPatch.cs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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
     }