From e56d700df44517713632e1060e4585963be12d36 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 11 Nov 2018 14:10:57 +0100 Subject: [PATCH] Revert respect ESX config --- client/main.lua | 24 +++++++++++------------- server/main.lua | 5 ++--- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/client/main.lua b/client/main.lua index 4a4dbb1c..ae8e51ad 100644 --- a/client/main.lua +++ b/client/main.lua @@ -125,21 +125,19 @@ AddEventHandler('esx_status:setDisplay', function(val) end) -- Pause menu disable hud display -if ESX.GetConfig().EnableHud then - Citizen.CreateThread(function() - while true do - Citizen.Wait(300) +Citizen.CreateThread(function() + while true do + Citizen.Wait(300) - if IsPauseMenuActive() and not isPaused then - isPaused = true - TriggerEvent('esx_status:setDisplay', 0.0) - elseif not IsPauseMenuActive() and isPaused then - isPaused = false - TriggerEvent('esx_status:setDisplay', 0.5) - end + if IsPauseMenuActive() and not isPaused then + isPaused = true + TriggerEvent('esx_status:setDisplay', 0.0) + elseif not IsPauseMenuActive() and isPaused then + isPaused = false + TriggerEvent('esx_status:setDisplay', 0.5) end - end) -end + end +end) -- Loaded event Citizen.CreateThread(function() diff --git a/server/main.lua b/server/main.lua index eed4d956..ab6b18c5 100644 --- a/server/main.lua +++ b/server/main.lua @@ -46,10 +46,9 @@ end) RegisterServerEvent('esx_status:update') AddEventHandler('esx_status:update', function(status) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(source) - if xPlayer ~= nil then + if xPlayer then xPlayer.set('status', status) end end)