From 39f40ad639e7c51b9a15951d9b7a4f668e72eb1d Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Sat, 19 Feb 2022 00:38:39 +0100
Subject: [PATCH] Fix VM abort if InvinciballArmor.HandleDamage is called right
 as the powerup ends.

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

diff --git a/language.version b/language.version
index 46c9f31b7..fab82d4ab 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r164 \cu(Thu 17 Feb 10:32:26 CET 2022)\c-";
-SWWM_SHORTVER="\cw1.2pre r164 \cu(2022-02-17 10:32:26)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r165 \cu(Sat 19 Feb 00:38:39 CET 2022)\c-";
+SWWM_SHORTVER="\cw1.2pre r165 \cu(2022-02-19 00:38:39)\c-";
diff --git a/zscript/items/swwm_powerups.zsc b/zscript/items/swwm_powerups.zsc
index 9fc3eada7..15b0e02c4 100644
--- a/zscript/items/swwm_powerups.zsc
+++ b/zscript/items/swwm_powerups.zsc
@@ -790,7 +790,7 @@ Class InvinciballArmor : SWWMArmor
 	override int HandleDamage( int damage, Name damageType, int flags )
 	{
 		if ( damageType == 'EndLevel' ) return 0;
-		InvinciballPower(master).DoHitFX();
+		if ( master ) InvinciballPower(master).DoHitFX();
 		return damage;
 	}
 	override void DoEffect()