From 2d51dce26d595db822000f3251b99fbb76de6a18 Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Sat, 11 Mar 2023 01:06:32 +0100
Subject: [PATCH] Fix Candy Gun reselecting if dead mid-throw.

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

diff --git a/language.version b/language.version
index 760bf933d..837b1d3d4 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r788 \cu(Fri 10 Mar 20:36:36 CET 2023)\c-";
-SWWM_SHORTVER="\cw1.3pre r788 \cu(2023-03-10 20:36:36)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r789 \cu(Sat 11 Mar 01:06:32 CET 2023)\c-";
+SWWM_SHORTVER="\cw1.3pre r789 \cu(2023-03-11 01:06:32)\c-";
diff --git a/zscript/weapons/swwm_tastytreat.zsc b/zscript/weapons/swwm_tastytreat.zsc
index 5dc17c532..44f551388 100644
--- a/zscript/weapons/swwm_tastytreat.zsc
+++ b/zscript/weapons/swwm_tastytreat.zsc
@@ -554,7 +554,7 @@ Class CandyGun : SWWMWeapon
 		{
 			invoker.bNODEATHDESELECT = false;
 			if ( (invoker.Amount > 0) && (invoker.Ammo2.Amount >= 0) ) A_LoadMag();
-			if ( invoker.clipcount > 0 )
+			if ( (invoker.clipcount > 0) && (Health > 0) )
 			{
 				invoker.PlayUpSound(self);
 				return ResolveState("Select");