From 37d97d0f7fc1bc587b5f6e174a8a70a32caac020 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Sat, 7 Nov 2020 10:26:31 +0100
Subject: [PATCH] ShouldSpawnDualExpl() must also check travelling inventory.

---
 language.version         | 2 +-
 zscript/swwm_handler.zsc | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/language.version b/language.version
index 975d7e74c..cd5b505be 100644
--- a/language.version
+++ b/language.version
@@ -1,2 +1,2 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r606 \cu(Sat  7 Nov 09:16:44 CET 2020)";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r608 \cu(Sat  7 Nov 10:27:26 CET 2020)";
diff --git a/zscript/swwm_handler.zsc b/zscript/swwm_handler.zsc
index 72bfdc474..5b67944c3 100644
--- a/zscript/swwm_handler.zsc
+++ b/zscript/swwm_handler.zsc
@@ -1584,6 +1584,15 @@ Class SWWMHandler : EventHandler
 	private bool ShouldSpawnDualExpl()
 	{
 		int np = 0, ng = 0;
+		// check travelling items, in case this was called mid-transition
+		let ti = ThinkerIterator.Create("ExplodiumGun",Thinker.STAT_TRAVELLING);
+		ExplodiumGun g;
+		while ( g = ExplodiumGun(ti.Next()) )
+		{
+			np++;
+			if ( g.Amount > 1 ) ng++;
+		}
+		if ( np > 0 ) return (ng < np);
 		for ( int i=0; i<MAXPLAYERS; i++ )
 		{
 			if ( !playeringame[i] || !players[i].mo ) continue;