aboutsummaryrefslogtreecommitdiff
path: root/Northstar.Custom/mod
diff options
context:
space:
mode:
authorDinorush <onparnorthstar@gmail.com>2022-02-14 21:24:26 -0500
committerGeckoEidechse <gecko.eidechse+git@pm.me>2022-02-15 23:43:40 +0100
commitb08917da6e2cf01bfac6728b3f8bbcaf0ea64649 (patch)
treefb1b59aeea813916f434cc467fd43422afce1625 /Northstar.Custom/mod
parent66a75f222d7137026315dd74d3378445ab5a2329 (diff)
downloadNorthstarMods-b08917da6e2cf01bfac6728b3f8bbcaf0ea64649.tar.gz
NorthstarMods-b08917da6e2cf01bfac6728b3f8bbcaf0ea64649.zip
Fix non-player and invalid ent assist crashes + self-assists
Diffstat (limited to 'Northstar.Custom/mod')
-rw-r--r--Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_gg.gnut5
1 files changed, 4 insertions, 1 deletions
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<int, bool> 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