Akkariin/cfx-server-data
1
0
Fork 0
mirror of https://github.com/citizenfx/cfx-server-data.git synced 2025-02-13 09:42:53 +08:00
Code Issues Releases Wiki Activity

Fix baseevents' deathmanager to include a hash for the weapon the player was killed with

Browse Source
This commit is contained in:
0x420 2017-07-09 21:05:41 +02:00 committed by moscovium
parent 07ba1df6ca
commit e5ca05f59e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/[system]/baseevents/deathevents.lua
View File

@ -17,7 +17,7 @@ Citizen.CreateThread(function()
diedAt = GetGameTimer() diedAt = GetGameTimer()
end end
local killer = NetworkGetEntityKillerOfPlayer(player) local killer, killerweapon = NetworkGetEntityKillerOfPlayer(player)
local killerentitytype = GetEntityType(killer) local killerentitytype = GetEntityType(killer)
local killertype = -1 local killertype = -1
local killerinvehicle = false local killerinvehicle = false
@ -43,8 +43,8 @@ Citizen.CreateThread(function()
TriggerServerEvent('baseevents:onPlayerDied', killertype, { table.unpack(GetEntityCoords(ped)) }) TriggerServerEvent('baseevents:onPlayerDied', killertype, { table.unpack(GetEntityCoords(ped)) })
hasBeenDead = true hasBeenDead = true
else else
TriggerEvent('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, 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 hasBeenDead = true
end end
elseif not IsPedFatallyInjured(ped) then elseif not IsPedFatallyInjured(ped) then