From 530d2ed1ea75f7152ee3dd8ea17c4d96b7d1380e Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Tue, 28 Jul 2020 09:30:36 +0200 Subject: [PATCH] Hotfix: Crash when enemies are killed without inflictor/source. --- zscript/utcommon.zsc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zscript/utcommon.zsc b/zscript/utcommon.zsc index bfce6c2..ebfcd6d 100644 --- a/zscript/utcommon.zsc +++ b/zscript/utcommon.zsc @@ -3546,10 +3546,10 @@ Class UTMainHandler : EventHandler if ( !e.Thing.player && !e.Thing.bIsMonster && !e.Thing.bCountKill ) return; if ( (e.Inflictor && e.Inflictor.player && (e.Inflictor != e.Thing)) || (e.DamageSource && e.DamageSource.player && (e.DamageSource != e.Thing)) ) { - Weapon saw = Weapon(e.Inflictor.FindInventory("UTChainsaw")); - if ( !saw ) saw = Weapon(e.DamageSource.FindInventory("UTChainsaw")); + Weapon saw = Weapon(e.Inflictor?e.Inflictor.FindInventory("UTChainsaw"):null); + if ( !saw ) saw = Weapon(e.DamageSource?e.DamageSource.FindInventory("UTChainsaw"):null); bool current = false; - if ( e.Inflictor.player && e.Inflictor.player.ReadyWeapon == saw ) current = true; + if ( e.Inflictor.player && (e.Inflictor.player.ReadyWeapon == saw) ) current = true; if ( e.DamageSource.player && (e.DamageSource.player.ReadyWeapon == saw) ) current = true; if ( flak_sawammo && saw && (saw.Ammo1.Amount < 40) && !current && !Random[SawDrop](0,9) ) {