From 246fcdefd0879747e9460fe44834d9f942fc5dd8 Mon Sep 17 00:00:00 2001 From: Kasey FItton Date: Thu, 7 Nov 2024 17:45:33 +0000 Subject: [PATCH] fix(es_extended/client/death): trigger Death if player --- [core]/es_extended/client/modules/death.lua | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/[core]/es_extended/client/modules/death.lua b/[core]/es_extended/client/modules/death.lua index d82d1a66..4054421e 100644 --- a/[core]/es_extended/client/modules/death.lua +++ b/[core]/es_extended/client/modules/death.lua @@ -25,7 +25,6 @@ function Death:ByPlayer() killerClientId = self.killerId, } - self:ResetValues() TriggerEvent("esx:onPlayerDeath", data) TriggerServerEvent("esx:onPlayerDeath", data) end @@ -40,23 +39,26 @@ function Death:Natual() deathCause = self.deathCause, } - self:ResetValues() TriggerEvent("esx:onPlayerDeath", data) TriggerServerEvent("esx:onPlayerDeath", data) end function Death:Damaged(victim, victimDied) + if not victimDied then + return + end + if not IsEntityAPed(victim) then return end - if IsPedAPlayer(victim) then + if not IsPedAPlayer(victim) then return end local victimId = NetworkGetPlayerIndexFromPed(victim) local isDead = IsPedDeadOrDying(victim, true) or IsPedFatallyInjured(victim) - if not victimDied or victimId ~= ESX.playerId or not isDead then + if victimId ~= ESX.playerId or not isDead then return end @@ -72,6 +74,8 @@ function Death:Damaged(victim, victimDied) else self:Natual() end + + self:ResetValues() end AddEventHandler("gameEventTriggered", function(event, data)