From 1c2c08822bb119dd1d913ece4dbfe0862adf6531 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Sun, 6 Jun 2021 20:44:28 +0200
Subject: [PATCH] Fix Ynykron'd bots not respawning

---
 language.version                               | 4 ++--
 zscript/weapons/swwm_deathlydeathcannon_fx.zsc | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/language.version b/language.version
index 9bcc2f996..5383cca8a 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r529 \cu(Sun  6 Jun 20:44:10 CEST 2021)\c-";
-SWWM_SHORTVER="\cw0.9.11b-pre r529 \cu(2021-06-06 20:44:10)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r530 \cu(Sun  6 Jun 20:44:28 CEST 2021)\c-";
+SWWM_SHORTVER="\cw0.9.11b-pre r530 \cu(2021-06-06 20:44:28)\c-";
diff --git a/zscript/weapons/swwm_deathlydeathcannon_fx.zsc b/zscript/weapons/swwm_deathlydeathcannon_fx.zsc
index e9dc07b2d..43201dd50 100644
--- a/zscript/weapons/swwm_deathlydeathcannon_fx.zsc
+++ b/zscript/weapons/swwm_deathlydeathcannon_fx.zsc
@@ -55,7 +55,8 @@ Class PlayerGone : PlayerChunk
 		if ( multiplayer || level.AllowRespawn || sv_singleplayerrespawn || G_SkillPropertyInt(SKILLP_PlayerRespawn) )
 		{
 			// standard behaviour, respawn normally
-			if ( (((player.cmd.buttons&BT_USE) && !player.Bot) || ((deathmatch || alwaysapplydmflags) && sv_forcerespawn && (Level.maptime >= player.respawn_time))) && !sv_norespawn )
+			if ( (((player.cmd.buttons&BT_USE) || ((deathmatch || alwaysapplydmflags) && sv_forcerespawn)) && !sv_norespawn)
+				&& ((Level.maptime >= player.respawn_time) || ((player.cmd.buttons&BT_USE) && !player.Bot)) )
 			{
 				player.cls = null;
 				player.playerstate = PST_REBORN;