starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-29 17:28:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #57 from thelindat/master

Browse Source 
refactor+fix(server/main): Check if using Legacy; use ternary to define xPlayers; fixed incorrect values when defining xPlayer
This commit is contained in:
Taso
2021-06-05 18:23:41 -04:00
committed by GitHub
parent bbc848e699 b3c20e174b
commit d752235eb4
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/main.lua
+5 -14
View File
@@ -1,21 +1,17 @@
ESX = nil
TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
local isLegacy = not not ESX.GetExtendedPlayers
AddEventHandler('onResourceStart', function(resourceName)
if (GetCurrentResourceName() ~= resourceName) then
return
end
local xPlayers
if ESX.GetExtendedPlayers then
xPlayers = ESX.GetExtendedPlayers() -- Retrieve all xPlayer data directly (ESX Legacy)
else
xPlayers = ESX.GetPlayers() -- Retrieves player ids and gets xPlayer data one-by-one (ESX 1.2 support)
end
local xPlayers = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers()
for k,v in pairs(xPlayers) do
local xPlayer = type(v) ~= 'table' and v or ESX.GetPlayerFromId(k)
local xPlayer = type(v) == 'table' and v or ESX.GetPlayerFromId(v)
MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', {
['@identifier'] = xPlayer.identifier
}, function(result)
@@ -104,15 +100,10 @@ function SaveData()
local firstItem = true
local playerCount = 0
local xPlayers
if ESX.GetExtendedPlayers then
xPlayers = ESX.GetExtendedPlayers() -- Retrieve all xPlayer data directly (ESX Legacy)
else
xPlayers = ESX.GetPlayers() -- Retrieves player ids and gets xPlayer data one-by-one (ESX 1.2 support)
end
local xPlayers = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers()
for k,v in pairs(xPlayers) do
local xPlayer = type(v) ~= 'table' and v or ESX.GetPlayerFromId(k)
local xPlayer = type(v) == 'table' and v or ESX.GetPlayerFromId(v)
local status = xPlayer.get('status')
whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', xPlayer.identifier, json.encode(status))