OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Hotfix: Crash when enemies are killed without inflictor/source.

Browse source
This commit is contained in:
Marisa the Magician 2020-07-28 09:30:36 +02:00
commit 530d2ed1ea
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
zscript/utcommon.zsc
View file

@ -3546,10 +3546,10 @@ Class UTMainHandler : EventHandler
if ( !e.Thing.player && !e.Thing.bIsMonster && !e.Thing.bCountKill ) return; 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)) ) 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")); Weapon saw = Weapon(e.Inflictor?e.Inflictor.FindInventory("UTChainsaw"):null);
if ( !saw ) saw = Weapon(e.DamageSource.FindInventory("UTChainsaw")); if ( !saw ) saw = Weapon(e.DamageSource?e.DamageSource.FindInventory("UTChainsaw"):null);
bool current = false; 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 ( e.DamageSource.player && (e.DamageSource.player.ReadyWeapon == saw) ) current = true;
if ( flak_sawammo && saw && (saw.Ammo1.Amount < 40) && !current && !Random[SawDrop](0,9) ) if ( flak_sawammo && saw && (saw.Ammo1.Amount < 40) && !current && !Random[SawDrop](0,9) )
{ {