From d2bb60b55966c3f62c64aaceec2ece006d0d5b53 Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Sat, 4 May 2024 18:37:52 +0200
Subject: [PATCH] Oops... Forgot to change some references here.

---
 language.version                | 4 ++--
 zscript/items/swwm_funstuff.zsc | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/language.version b/language.version
index d6925d3d5..5c48147e9 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1128 \cu(Thu May  2 10:19:12 CEST 2024)\c-";
-SWWM_SHORTVER="\cw1.3pre r1128 \cu(2024-05-02 10:19:12)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1129 \cu(Sat May  4 18:37:52 CEST 2024)\c-";
+SWWM_SHORTVER="\cw1.3pre r1129 \cu(2024-05-04 18:37:52)\c-";
diff --git a/zscript/items/swwm_funstuff.zsc b/zscript/items/swwm_funstuff.zsc
index 8438fa615..467b19422 100644
--- a/zscript/items/swwm_funstuff.zsc
+++ b/zscript/items/swwm_funstuff.zsc
@@ -1205,20 +1205,23 @@ Class Chancebox : Actor
 			s.scale *= 2.4;
 		}
 		// handling these AFTER item drop should ensure no wacky stuff happens with repeated "all clear" events
+		// note: if we delay it like this, we have to check for non-null user just to be safe
 		if ( bCOUNTITEM )
 		{
-			user.player.itemcount++;
+			if ( target ) target.player.itemcount++;
 			level.found_items++;
 			bCOUNTITEM = false;
 		}
 		if ( bCOUNTSECRET )
 		{
-			user.GiveSecret();
+			if ( target ) target.GiveSecret();
+			else level.found_secrets++;
 			bCOUNTSECRET = false;
 		}
 		if ( special )
 		{
-			user.A_CallSpecial(special,args[0],args[1],args[2],args[3],args[4]);
+			if ( target ) target.A_CallSpecial(special,args[0],args[1],args[2],args[3],args[4]);
+			else level.ExecuteSpecial(special,null,null,false,args[0],args[1],args[2],args[3],args[4]);
 			special = 0;
 		}
 	}