From 46eb3e628272db5257bdd5f7198085462189a605 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Wed, 6 Oct 2021 19:02:27 +0200 Subject: [PATCH] Another null pointer check after a damagemobj call. I'm starting to think people just keep coding zero-tic death states on purpose. --- 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 22138acbc..4e8ae418f 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1.16 \cu(Wed 6 Oct 00:27:03 CEST 2021)\c-"; -SWWM_SHORTVER="\cw1.1.16 \cu(2021-10-06 00:27:03)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1.17 \cu(Wed 6 Oct 19:02:58 CEST 2021)\c-"; +SWWM_SHORTVER="\cw1.1.17 \cu(2021-10-06 19:02:58)\c-"; diff --git a/zscript/items/swwm_powerups.zsc b/zscript/items/swwm_powerups.zsc index 89aa3a2a0..d91a55e8b 100644 --- a/zscript/items/swwm_powerups.zsc +++ b/zscript/items/swwm_powerups.zsc @@ -1539,7 +1539,7 @@ Class LampMoth : Actor Vector3 awaydir = level.Vec3Diff(target.Vec3Offset(0,0,target.height),pos).unit(); vel += awaydir*8.; int dmg = target.DamageMobj(self,master?master:Actor(self),GetMissileDamage(0,0),'Melee',Random[Moth](0,8)?DMG_NO_PAIN:0); - if ( !target.bNOBLOOD && !target.bDORMANT && !target.bINVULNERABLE ) + if ( target && !target.bNOBLOOD && !target.bDORMANT && !target.bINVULNERABLE ) { target.TraceBleed(dmg,self); target.SpawnBlood(pos,atan2(awaydir.y,awaydir.x)+180,dmg);