Akkariin/cfx-server-data
1
0
Fork 0
mirror of https://github.com/citizenfx/cfx-server-data.git synced 2026-05-16 18:32:32 +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
Unverified
parent 07ba1df6ca
commit e5ca05f59e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/[system]/baseevents/deathevents.lua
+3 -3
View File
@@ -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