From 7d8b3f2dd438af7ad56b870b54fb3ccc7c2ee8a9 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Sat, 23 Oct 2021 11:52:14 +0200
Subject: [PATCH] Death exit fix from master.

---
 language.version                           | 4 ++--
 zscript/handler/swwm_handler_worldload.zsc | 4 ++--
 zscript/swwm_player.zsc                    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/language.version b/language.version
index bcddc013a..7cafa7c9d 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r40 \cu(Fri 22 Oct 19:02:36 CEST 2021)\c-";
-SWWM_SHORTVER="\cw1.2pre r40 \cu(2021-10-22 19:02:36)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r41 \cu(Sat 23 Oct 11:52:14 CEST 2021)\c-";
+SWWM_SHORTVER="\cw1.2pre r41 \cu(2021-10-23 11:52:14)\c-";
diff --git a/zscript/handler/swwm_handler_worldload.zsc b/zscript/handler/swwm_handler_worldload.zsc
index b74ccf4cc..a4f7cd908 100644
--- a/zscript/handler/swwm_handler_worldload.zsc
+++ b/zscript/handler/swwm_handler_worldload.zsc
@@ -100,7 +100,7 @@ extend Class SWWMHandler
 		// reset score on dead players (death exit™)
 		for ( int i=0; i<MAXPLAYERS; i++ )
 		{
-			if ( !playeringame[i] || (players[i].Health > 0) ) continue;
+			if ( !playeringame[i] || (players[i].playerstate != PST_DEAD) ) continue;
 			let c = SWWMCredits.Find(players[i]);
 			if ( c ) c.credits = c.hcredits = 0;
 		}
@@ -112,7 +112,7 @@ extend Class SWWMHandler
 		{
 			for ( int i=0; i<MAXPLAYERS; i++ )
 			{
-				if ( !playeringame[i] || !players[i].mo ) continue;
+				if ( !playeringame[i] || !players[i].mo || (players[i].playerstate == PST_DEAD) ) continue;
 				players[i].mo.GiveInventory("InventoryWipeToken",1);
 				// the playerpawn will know what to do with this in its PreTravelled()
 			}
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index dffb90cc8..2563fb05f 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -2949,7 +2949,7 @@ Class Demolitionist : PlayerPawn
 		// clean up attached actors
 		if ( selflight ) selflight.Destroy();
 		// inventory wipes
-		if ( FindInventory("InventoryWipeToken") )
+		if ( FindInventory("InventoryWipeToken") && (player.playerstate != PST_DEAD) )
 			SWWMUtility.WipeInventory(self,swwm_resetscore);
 	}
 	override void Travelled()