From e5ca05f59e69063398921d981f0c155c50b89612 Mon Sep 17 00:00:00 2001 From: 0x420 <0x420@sigaint.org> Date: Sun, 9 Jul 2017 21:05:41 +0200 Subject: [PATCH] Fix baseevents' deathmanager to include a hash for the weapon the player was killed with --- resources/[system]/baseevents/deathevents.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/[system]/baseevents/deathevents.lua b/resources/[system]/baseevents/deathevents.lua index 089cdc3..221bf6a 100644 --- a/resources/[system]/baseevents/deathevents.lua +++ b/resources/[system]/baseevents/deathevents.lua @@ -17,7 +17,7 @@ Citizen.CreateThread(function() diedAt = GetGameTimer() end - local killer = NetworkGetEntityKillerOfPlayer(player) + local killer, killerweapon = NetworkGetEntityKillerOfPlayer(player) local killerentitytype = GetEntityType(killer) local killertype = -1 local killerinvehicle = false @@ -43,8 +43,8 @@ Citizen.CreateThread(function() TriggerServerEvent('baseevents:onPlayerDied', killertype, { table.unpack(GetEntityCoords(ped)) }) hasBeenDead = true else - TriggerEvent('baseevents:onPlayerKilled', killerid, {killertype=killertype, killerinveh=killerinvehicle, killervehseat=killervehicleseat, killervehname=killervehiclename, killerpos=table.unpack(GetEntityCoords(ped))}) - TriggerServerEvent('baseevents:onPlayerKilled', killerid, {killertype=killertype, killerinveh=killerinvehicle, killervehseat=killervehicleseat, killervehname=killervehiclename, killerpos=table.unpack(GetEntityCoords(ped))}) + TriggerEvent('baseevents:onPlayerKilled', killerid, {killertype=killertype, weaponhash = killerweapon, killerinveh=killerinvehicle, killervehseat=killervehicleseat, killervehname=killervehiclename, killerpos=table.unpack(GetEntityCoords(ped))}) + TriggerServerEvent('baseevents:onPlayerKilled', killerid, {killertype=killertype, weaponhash = killerweapon, killerinveh=killerinvehicle, killervehseat=killervehicleseat, killervehname=killervehiclename, killerpos=table.unpack(GetEntityCoords(ped))}) hasBeenDead = true end elseif not IsPedFatallyInjured(ped) then