From c2fc63b1fafc45dfe116cb7cd4fd7fc60f3d3f1d Mon Sep 17 00:00:00 2001 From: roseasromeo <11944660+roseasromeo@users.noreply.github.com> Date: Sun, 28 Sep 2025 09:48:44 -0500 Subject: [PATCH 1/2] attempt to address player not dying on deathlink --- ArchipelagoRandomizer/DeathManager.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ArchipelagoRandomizer/DeathManager.cs b/ArchipelagoRandomizer/DeathManager.cs index d3f8a7f..ebb9258 100644 --- a/ArchipelagoRandomizer/DeathManager.cs +++ b/ArchipelagoRandomizer/DeathManager.cs @@ -91,6 +91,11 @@ private void OnDeathReceived(DeathLink deathLink) private IEnumerator DoDeathReceived(DeathLink deathLink) { Logger.Log("Received death! You will die when next possible..."); + while (!PlayerGlobal.instance) + { + // if Player doesn't exist yet + yield return null; + } PlayerGlobal player = PlayerGlobal.instance; preventDeath = true; @@ -112,8 +117,8 @@ private IEnumerator DoDeathReceived(DeathLink deathLink) diedFromDeathLink = true; // Apply damage instead of calling Die method to avoid issues - damageable.SetHealth(1); - damageable.ReceiveDamage(1, 0, player.transform.position, player.transform.position, Damageable.DamageType.Hole, 1); + damageable.SetHealth(1f); + damageable.ReceiveDamage(10f, 0, player.transform.position, player.transform.position, Damageable.DamageType.Hole, 1); StartCoroutine(DeathCooldownTimer()); } From ac7448e8324b1164db337e9a011d24bcbe69af41 Mon Sep 17 00:00:00 2001 From: roseasromeo <11944660+roseasromeo@users.noreply.github.com> Date: Sun, 28 Sep 2025 09:50:13 -0500 Subject: [PATCH 2/2] clean up unused pausecontroller --- ArchipelagoRandomizer/DeathManager.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ArchipelagoRandomizer/DeathManager.cs b/ArchipelagoRandomizer/DeathManager.cs index ebb9258..a26fac8 100644 --- a/ArchipelagoRandomizer/DeathManager.cs +++ b/ArchipelagoRandomizer/DeathManager.cs @@ -13,7 +13,6 @@ internal class DeathManager : MonoBehaviour private DeathLinkService deathLinkService; private DamageablePlayer damageable; - private UIMenuPauseController pauseController; private readonly List deathMessages = [ "{name}'s last feather has fallen...", @@ -104,11 +103,6 @@ private IEnumerator DoDeathReceived(DeathLink deathLink) damageable = player.GetComponent(); } - if (pauseController == null) - { - pauseController = FindObjectOfType(); - } - while (!CanDie()) { yield return null;