From 1bbd9b119ad3b979f9589929948ed878ca9a845e Mon Sep 17 00:00:00 2001 From: Ilias Rbayti <63159154+Kenshiin13@users.noreply.github.com> Date: Thu, 28 Nov 2024 18:49:34 +0100 Subject: [PATCH] refactor(es_extended/client/modules/death): cleanup redundant checks --- [core]/es_extended/client/modules/death.lua | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/[core]/es_extended/client/modules/death.lua b/[core]/es_extended/client/modules/death.lua index 248916b6..ccd7d380 100644 --- a/[core]/es_extended/client/modules/death.lua +++ b/[core]/es_extended/client/modules/death.lua @@ -44,12 +44,6 @@ function Death:Natural() end function Death:Damaged(victim) - local victimId = NetworkGetPlayerIndexFromPed(victim) - local isDead = IsPedDeadOrDying(victim, true) or IsPedFatallyInjured(victim) - if victimId ~= ESX.playerId or not isDead then - return - end - self.killerEntity = GetPedSourceOfDeath(ESX.PlayerData.ped) self.deathCause = GetPedCauseOfDeath(ESX.PlayerData.ped) self.killerId = NetworkGetPlayerIndexFromPed(self.killerEntity) @@ -69,7 +63,7 @@ end AddEventHandler("esx:onPlayerSpawn", function() Citizen.CreateThreadNow(function() while not ESX.PlayerData.dead do - if IsPedDeadOrDying(ESX.PlayerData.ped, true) then + if IsPedDeadOrDying(ESX.PlayerData.ped, true) or IsPedFatallyInjured(ESX.PlayerData.ped) then Death:Damaged(ESX.PlayerData.ped) break end