From 8522b47e6945465147a5e98f0cd5e4de02bf2fb2 Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Tue, 4 Jul 2023 13:51:25 +0200
Subject: [PATCH] Fix Grilled Cheese Sandwich teleporting player out of bounds
 after a death exit.

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

diff --git a/language.version b/language.version
index 4cfdb32da..24049aaba 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r821 \cu(Tue  4 Jul 13:51:01 CEST 2023)\c-";
-SWWM_SHORTVER="\cw1.3pre r821 \cu(2023-07-04 13:51:01)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r822 \cu(Tue  4 Jul 13:51:25 CEST 2023)\c-";
+SWWM_SHORTVER="\cw1.3pre r822 \cu(2023-07-04 13:51:25)\c-";
diff --git a/zscript/items/swwm_powerups.zsc b/zscript/items/swwm_powerups.zsc
index d58899e52..2fbe1f8db 100644
--- a/zscript/items/swwm_powerups.zsc
+++ b/zscript/items/swwm_powerups.zsc
@@ -127,6 +127,11 @@ Class GrilledCheeseSandwich : Inventory
 		}
 		Owner.Teleport(safepos,safeangle,0);
 	}
+	override void Travelled()
+	{
+		Super.Travelled();
+		dteleport = 0;	// ensure we don't teleport immediately after a death exit (yes, this can happen)
+	}
 	override void DoEffect()
 	{
 		Super.DoEffect();