From 02373b99f0ce5dbee8c8f1cf175e5adb3e58b494 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Thu, 11 Aug 2022 16:24:23 +0200 Subject: [PATCH] Fix a potential crash when selling weapons. --- language.version | 4 ++-- zscript/handler/swwm_handler_process.zsc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/language.version b/language.version index 701584f2d..3f50bb72c 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r296 \cu(Thu 11 Aug 10:52:54 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r296 \cu(2022-08-11 10:52:54)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r297 \cu(Thu 11 Aug 16:24:23 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r297 \cu(2022-08-11 16:24:23)\c-"; diff --git a/zscript/handler/swwm_handler_process.zsc b/zscript/handler/swwm_handler_process.zsc index 9f2f77c11..cd6c8b203 100644 --- a/zscript/handler/swwm_handler_process.zsc +++ b/zscript/handler/swwm_handler_process.zsc @@ -389,7 +389,7 @@ extend Class SWWMHandler if ( item is 'SWWMWeapon' ) { let c = Weapon(players[e.Args[0]].mo.FindInventory(item)); - if ( c.SisterWeapon && (players[e.Args[0]].ReadyWeapon == c.SisterWeapon) ) + if ( c && c.SisterWeapon && (players[e.Args[0]].ReadyWeapon == c.SisterWeapon) ) { players[e.Args[0]].ReadyWeapon = c; players[e.Args[0]].SetPSprite(PSP_WEAPON,c.FindState("Ready"));