Award vehicle run-over kills to the driver

Instead of the vehicle itself
Facepunch · Sep 21, 2013 · 9d84628 · 9d84628
1 parent 267608d
commit 9d84628
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/garrysmod/gamemodes/base/gamemode/npc.lua b/garrysmod/gamemodes/base/gamemode/npc.lua
@@ -21,6 +21,10 @@ function GM:OnNPCKilled( ent, attacker, inflictor )
 
 		AttackerClass = attacker:GetClass() 
 
+		if ( attacker:IsVehicle() && IsValid( attacker:GetDriver() ) ) then
+			attacker = attacker:GetDriver()
+		end
+		
 		if ( attacker:IsPlayer() ) then
 
 			umsg.Start( "PlayerKilledNPC" )

diff --git a/garrysmod/gamemodes/base/gamemode/player.lua b/garrysmod/gamemodes/base/gamemode/player.lua
@@ -137,6 +137,10 @@ function GM:PlayerDeath( Victim, Inflictor, Attacker )
 	Victim.NextSpawnTime = CurTime() + 2
 	Victim.DeathTime = CurTime()
 	
+	if ( IsValid( Attacker ) && Attacker:IsVehicle() && IsValid( Attacker:GetDriver() ) ) then
+		Attacker = Attacker:GetDriver()
+	end
+
 	if ( !IsValid( Inflictor ) && IsValid( Attacker ) ) then
 		Inflictor = Attacker
 	end
@@ -148,9 +152,9 @@ function GM:PlayerDeath( Victim, Inflictor, Attacker )
 	
 		Inflictor = Inflictor:GetActiveWeapon()
 		if ( !IsValid( Inflictor ) ) then Inflictor = Attacker end
-	
+
 	end
-	
+
 	if (Attacker == Victim) then
 	
 		umsg.Start( "PlayerKilledSelf" )