From 4bff19e20dce18400fb5023ba4f2b1dd78d008df Mon Sep 17 00:00:00 2001
From: milesthenerd <lassiterm@netspec.us>
Date: Sun, 26 Dec 2021 00:32:50 -0600
Subject: [PATCH] Fixed weird SA-X death

---
 objects/oControl.object.gmx    | 7 +++----
 scripts/characterStepEvent.gml | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/objects/oControl.object.gmx b/objects/oControl.object.gmx
index e5a7e39b..18fd711a 100644
--- a/objects/oControl.object.gmx
+++ b/objects/oControl.object.gmx
@@ -1529,10 +1529,9 @@ if (global.mapmarker) {
           <argument>
             <kind>1</kind>
             <string>/// Player death transition
-if(global.playerhealth &lt;= 0 &amp;&amp; global.saxmode &amp;&amp; global.sax &amp;&amp; oCharacter.sprite_index != sCoreXSAX){
-    global.playerhealth = 1;
-    exit;
-}
+if(global.playerhealth &lt;= 0 &amp;&amp; global.saxmode &amp;&amp; global.sax &amp;&amp; oCharacter.sprite_index != sCoreXSAX) global.playerhealth = 1;
+
+if(global.playerhealth &gt;= 0) exit;
 
 if(instance_exists(oClient) &amp;&amp; oClient.connected){
     global.currX = oCharacter.x;
diff --git a/scripts/characterStepEvent.gml b/scripts/characterStepEvent.gml
index 4a01bc11..8c9fad1e 100644
--- a/scripts/characterStepEvent.gml
+++ b/scripts/characterStepEvent.gml
@@ -268,6 +268,7 @@ if (global.spectator) {
                 global.absorbDone = true;
                 absorbTime = 0;
                 global.playerhealth = -1;
+                global.spectator = false;
                 if (global.playerhealth <= 0) with (oControl) event_user(1);
             }
         }