From 6384476016471cafbc5e1a5913510c619e24fa07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 22 Aug 2017 00:58:59 +0200 Subject: [PATCH] Fix GetPlayers() + add GetPercent() --- server/classes/status.lua | 4 ++++ server/main.lua | 21 +++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/server/classes/status.lua b/server/classes/status.lua index b81969cc..7cf02782 100644 --- a/server/classes/status.lua +++ b/server/classes/status.lua @@ -43,6 +43,10 @@ function CreateStatus(xPlayer, name, default, color, visible, tickCallback, clie end end + self.getPercent = function() + return (self.val / Config.StatusMax) * 100 + end + self.updateClient = function() TriggerEvent('esx_status:updateClient', self.xPlayer.source) end diff --git a/server/main.lua b/server/main.lua index 6358de60..493065cd 100644 --- a/server/main.lua +++ b/server/main.lua @@ -130,16 +130,15 @@ function TickStatus() local xPlayers = ESX.GetPlayers() - for k,v in pairs(xPlayers) do + for i=1, #xPlayers, 1 do - local status = v.get('status') + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + local status = xPlayer.get('status') if status ~= nil then - for i=1, #status, 1 do status[i]._get('onTick')() end - end end @@ -152,8 +151,9 @@ function UpdateClients() local xPlayers = ESX.GetPlayers() - for k,v in pairs(xPlayers) do - TriggerEvent('esx_status:updateClient', v.source) + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + TriggerEvent('esx_status:updateClient', xPlayer.source) end SetTimeout(Config.UpdateClientTime, UpdateClients) @@ -164,10 +164,11 @@ function SaveData() local xPlayers = ESX.GetPlayers() - for k,v in pairs(xPlayers) do + for i=1, #xPlayers, 1 do - local data = {} - local status = v.get('status') + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + local data = {} + local status = xPlayer.get('status') for i=1, #status, 1 do @@ -183,7 +184,7 @@ function SaveData() 'UPDATE users SET status = @status WHERE identifier = @identifier', { ['@status'] = json.encode(data), - ['@identifier'] = v.identifier + ['@identifier'] = xPlayer.identifier } )