From f00a45cc99113f2fe412284a17637039b735b3f7 Mon Sep 17 00:00:00 2001 From: Dinorush Date: Mon, 14 Feb 2022 21:24:26 -0500 Subject: Fix non-player and invalid ent assist crashes + self-assists --- Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_gg.gnut | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Northstar.Custom/mod/scripts') diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_gg.gnut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_gg.gnut index 4d3d6612..b27892f7 100644 --- a/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_gg.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_gg.gnut @@ -81,7 +81,10 @@ void function OnPlayerKilled( entity victim, entity attacker, var damageInfo ) table alreadyAssisted foreach( DamageHistoryStruct attackerInfo in victim.e.recentDamageHistory ) { - if( attackerInfo.attacker != attacker && !( attackerInfo.attacker.GetEncodedEHandle() in alreadyAssisted ) ) + if ( !IsValid( attackerInfo.attacker ) || !attackerInfo.attacker.IsPlayer() || attackerInfo.attacker == victim ) + continue + + if ( attackerInfo.attacker != attacker && !( attackerInfo.attacker.GetEncodedEHandle() in alreadyAssisted ) ) { if ( attackerInfo.damageSourceId != eDamageSourceId.melee_pilot_emptyhanded ) { alreadyAssisted[attackerInfo.attacker.GetEncodedEHandle()] <- true -- cgit v1.2.3