From dc42a6378b1f9627f06fc592fb649c67a9a727f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Thu, 24 Aug 2017 16:53:53 +0200 Subject: [PATCH] Fix DeathFailOut effect + remove debug code --- client/main.lua | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/client/main.lua b/client/main.lua index b786afa7..e5ca39a2 100644 --- a/client/main.lua +++ b/client/main.lua @@ -44,11 +44,9 @@ function RespawnPed(ped, coords) end function StartRespawnToHospitalMenuTimer() - Citizen.Trace('player IsDead') ESX.SetTimeout(Config.MenuRespawnToHospitalDelay, function() - Citizen.Trace('timer started') if IsDead then local elements = {} @@ -127,10 +125,10 @@ end function RespawnTimer() -local timer = Config.RespawnDelayAfterRPDeath -local allowRespawn = Config.RespawnDelayAfterRPDeath/2 -local enoughMoney = false -local money = 0 + local timer = Config.RespawnDelayAfterRPDeath + local allowRespawn = Config.RespawnDelayAfterRPDeath/2 + local enoughMoney = false + local money = 0 if IsDead and Config.ShowDeathTimer then ESX.TriggerServerCallback('esx_ambulancejob:getBankMoney', function(money) @@ -635,19 +633,18 @@ AddEventHandler('baseevents:onPlayerKilled', function(killerId, data) end) AddEventHandler('esx_ambulancejob:onPlayerDeath', function() - Citizen.Trace('player died') + IsDead = true if Config.ShowDeathTimer == true then - Citizen.Trace('player died: true') RespawnTimer() else - Citizen.Trace('player died: false') StartRespawnTimer() StartRespawnToHospitalMenuTimer() - StartScreenEffect('DeathFailOut', 0, false) end + StartScreenEffect('DeathFailOut', 0, false) + end) RegisterNetEvent('esx_ambulancejob:revive')