From 8faeb6528dc4bb6b2af2169c9a14e0272452e06f Mon Sep 17 00:00:00 2001 From: Linden Date: Sat, 26 Jun 2021 01:00:18 +1000 Subject: [PATCH] improvement: Update xPlayer loops to use new function --- [esx]/esx_identity/server/main.lua | 4 +-- [esx_addons]/esx_bankerjob/server/main.lua | 4 +-- [esx_addons]/esx_holdup/server/main.lua | 14 ++++---- [esx_addons]/esx_phone/server/main.lua | 10 +++--- [esx_addons]/esx_policejob/config.lua | 2 +- .../esx_realestateagentjob/server/main.lua | 4 +-- [esx_addons]/esx_society/config.lua | 2 +- [esx_addons]/esx_society/server/main.lua | 33 +++++++++---------- [esx_addons]/esx_status/server/main.lua | 15 ++++----- [esx_addons]/esx_whitelist/server/main.lua | 11 ++----- server.cfg | 1 - 11 files changed, 46 insertions(+), 54 deletions(-) diff --git a/[esx]/esx_identity/server/main.lua b/[esx]/esx_identity/server/main.lua index ba3de70b..cebb66da 100644 --- a/[esx]/esx_identity/server/main.lua +++ b/[esx]/esx_identity/server/main.lua @@ -160,10 +160,10 @@ elseif not Config.UseDeferrals then Citizen.Wait(10) end - local xPlayers = ESX.GetPlayers() + local xPlayers = ESX.GetExtendedPlayers() for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + local xPlayer = xPlayers[i] if xPlayer then checkIdentity(xPlayer) diff --git a/[esx_addons]/esx_bankerjob/server/main.lua b/[esx_addons]/esx_bankerjob/server/main.lua index 96f5130e..68b19fe0 100644 --- a/[esx_addons]/esx_bankerjob/server/main.lua +++ b/[esx_addons]/esx_bankerjob/server/main.lua @@ -40,11 +40,11 @@ AddEventHandler('esx_bankerjob:customerWithdraw', function (target, amount) end) ESX.RegisterServerCallback('esx_bankerjob:getCustomers', function (source, cb) - local xPlayers = ESX.GetPlayers() + local xPlayers = ESX.GetExtendedPlayers() local customers = {} for i=1, #xPlayers do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + local xPlayer = xPlayers[i] TriggerEvent('esx_addonaccount:getAccount', 'bank_savings', xPlayer.identifier, function(account) table.insert(customers, { diff --git a/[esx_addons]/esx_holdup/server/main.lua b/[esx_addons]/esx_holdup/server/main.lua index 9d8f91c9..8e9dabf4 100644 --- a/[esx_addons]/esx_holdup/server/main.lua +++ b/[esx_addons]/esx_holdup/server/main.lua @@ -7,11 +7,11 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_holdup:tooFar') AddEventHandler('esx_holdup:tooFar', function(currentStore) local _source = source - local xPlayers = ESX.GetPlayers() + local xPlayers = ESX.GetExtendedPlayers() rob = false for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + local xPlayer = xPlayers[i] if xPlayer.job.name == 'police' then TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_cancelled_at', Stores[currentStore].nameOfStore)) @@ -30,7 +30,7 @@ RegisterServerEvent('esx_holdup:robberyStarted') AddEventHandler('esx_holdup:robberyStarted', function(currentStore) local _source = source local xPlayer = ESX.GetPlayerFromId(_source) - local xPlayers = ESX.GetPlayers() + local xPlayers = ESX.GetExtendedPlayers() if Stores[currentStore] then local store = Stores[currentStore] @@ -42,7 +42,7 @@ AddEventHandler('esx_holdup:robberyStarted', function(currentStore) local cops = 0 for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + local xPlayer = xPlayers[i] if xPlayer.job.name == 'police' then cops = cops + 1 end @@ -53,7 +53,7 @@ AddEventHandler('esx_holdup:robberyStarted', function(currentStore) rob = true for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + local xPlayer = xPlayers[i] if xPlayer.job.name == 'police' then TriggerClientEvent('esx:showNotification', xPlayers[i], _U('rob_in_prog', store.nameOfStore)) TriggerClientEvent('esx_holdup:setBlip', xPlayers[i], Stores[currentStore].position) @@ -81,9 +81,9 @@ AddEventHandler('esx_holdup:robberyStarted', function(currentStore) xPlayer.addMoney(store.reward) end - local xPlayers, xPlayer = ESX.GetPlayers(), nil + local xPlayers, xPlayer = ESX.GetExtendedPlayers(), nil for i=1, #xPlayers, 1 do - xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + xPlayer = xPlayers[i] if xPlayer.job.name == 'police' then TriggerClientEvent('esx:showNotification', xPlayers[i], _U('robbery_complete_at', store.nameOfStore)) diff --git a/[esx_addons]/esx_phone/server/main.lua b/[esx_addons]/esx_phone/server/main.lua index ee6b4e37..8b0a031e 100644 --- a/[esx_addons]/esx_phone/server/main.lua +++ b/[esx_addons]/esx_phone/server/main.lua @@ -4,15 +4,15 @@ local DisptachRequestId, PhoneNumbers = 0, {} TriggerEvent('esx:getSharedObject', function(obj) ESX = obj - local xPlayers = ESX.GetPlayers() + local xPlayers = ESX.GetExtendedPlayers() for i=1, #xPlayers, 1 do LoadPlayer(xPlayers[i]) end end) -function LoadPlayer(source) - local xPlayer = ESX.GetPlayerFromId(source) +function LoadPlayer(player) + local xPlayer = player for num,v in pairs(PhoneNumbers) do if tonumber(num) == num then -- if phonenumber is a player phone number @@ -107,8 +107,8 @@ AddEventHandler('esx_phone:getDistpatchRequestId', function(cb) cb(GetDistpatchRequestId()) end) -AddEventHandler('esx:playerLoaded', function(playerId) - LoadPlayer(playerId) +AddEventHandler('esx:playerLoaded', function(playerId, xPlayer) + LoadPlayer(xPlayer) end) AddEventHandler('esx:playerDropped', function(source) diff --git a/[esx_addons]/esx_policejob/config.lua b/[esx_addons]/esx_policejob/config.lua index 7717309c..46daeffd 100644 --- a/[esx_addons]/esx_policejob/config.lua +++ b/[esx_addons]/esx_policejob/config.lua @@ -7,7 +7,7 @@ Config.MarkerColor = {r = 50, g = 50, b = 204} Config.EnablePlayerManagement = false -- Enable if you want society managing. Config.EnableArmoryManagement = false -Config.EnableESXIdentity = false -- Enable if you're using esx_identity. +Config.EnableESXIdentity = true -- Enable if you're using esx_identity. Config.EnableLicenses = false -- Enable if you're using esx_license. Config.EnableHandcuffTimer = true -- Enable handcuff timer? will unrestrain player after the time ends. diff --git a/[esx_addons]/esx_realestateagentjob/server/main.lua b/[esx_addons]/esx_realestateagentjob/server/main.lua index 4b6db0d9..e699391e 100644 --- a/[esx_addons]/esx_realestateagentjob/server/main.lua +++ b/[esx_addons]/esx_realestateagentjob/server/main.lua @@ -47,12 +47,12 @@ end) ESX.RegisterServerCallback('esx_realestateagentjob:getCustomers', function(source, cb) TriggerEvent('esx_ownedproperty:getOwnedProperties', function(properties) - local xPlayers = ESX.GetPlayers() + local xPlayers = ESX.GetExtendedPlayers() local customers = {} for i=1, #properties, 1 do for j=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[j]) + local xPlayer = xPlayers[j] if xPlayer.identifier == properties[i].owner then table.insert(customers, { diff --git a/[esx_addons]/esx_society/config.lua b/[esx_addons]/esx_society/config.lua index e5c831b1..b81490cb 100644 --- a/[esx_addons]/esx_society/config.lua +++ b/[esx_addons]/esx_society/config.lua @@ -1,5 +1,5 @@ Config = {} Config.Locale = 'en' -Config.EnableESXIdentity = false +Config.EnableESXIdentity = true Config.MaxSalary = 3500 diff --git a/[esx_addons]/esx_society/server/main.lua b/[esx_addons]/esx_society/server/main.lua index 7a8bb583..c85d7d8b 100644 --- a/[esx_addons]/esx_society/server/main.lua +++ b/[esx_addons]/esx_society/server/main.lua @@ -3,7 +3,6 @@ local Jobs = {} local RegisteredSocieties = {} TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -local isLegacy = not not ESX.GetExtendedPlayers function GetSociety(name) for i=1, #RegisteredSocieties, 1 do @@ -171,25 +170,25 @@ end) ESX.RegisterServerCallback('esx_society:getEmployees', function(source, cb, society) local employees = {} - 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(v) + local xPlayers = ESX.GetExtendedPlayers() + for i=1, #xPlayers do + local xPlayer = xPlayers[i] - local name = GetPlayerName(xPlayer.source) - if Config.EnableESXIdentity then + local name = xPlayer.name + if Config.EnableESXIdentity and name == GetPlayerName(xPlayer.source) then name = xPlayer.get('firstName') .. ' ' .. xPlayer.get('lastName') end - if xPlayer.getJob().name == society then + if xPlayer.job.name == society then table.insert(employees, { name = name, identifier = xPlayer.identifier, job = { name = society, - label = xPlayer.getJob().label, - grade = xPlayer.getJob().grade, - grade_name = xPlayer.getJob().grade_name, - grade_label = xPlayer.getJob().grade_label + label = xPlayer.job.label, + grade = xPlayer.job.grade, + grade_name = xPlayer.job.grade_name, + grade_label = xPlayer.job.grade_label } }) end @@ -303,9 +302,9 @@ ESX.RegisterServerCallback('esx_society:setJobSalary', function(source, cb, job, }, function(rowsChanged) Jobs[job].grades[tostring(grade)].salary = salary - local xPlayers = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers() - for k,v in pairs(xPlayers) do - local xTarget = type(v) == 'table' and v or ESX.GetPlayerFromId(v) + local xPlayers = ESX.GetExtendedPlayers() + for i=1, #xPlayers do + local xTarget = xPlayers[i] if xTarget.job.name == job and xTarget.job.grade == grade then xTarget.setJob(job, grade) @@ -331,9 +330,9 @@ ESX.RegisterServerCallback('esx_society:getOnlinePlayers', function(source, cb) if getOnlinePlayers == false and next(onlinePlayers) == nil then -- Prevent multiple xPlayer loops from running in quick succession getOnlinePlayers, onlinePlayers = true, {} - 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(v) + local xPlayers = ESX.GetExtendedPlayers() + for i=1, #xPlayers do + local xPlayer = xPlayers[i] table.insert(onlinePlayers, { source = xPlayer.source, diff --git a/[esx_addons]/esx_status/server/main.lua b/[esx_addons]/esx_status/server/main.lua index 0d80cc83..556c534d 100644 --- a/[esx_addons]/esx_status/server/main.lua +++ b/[esx_addons]/esx_status/server/main.lua @@ -1,17 +1,16 @@ 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 = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers() + local xPlayers = ESX.GetExtendedPlayers() - for k,v in pairs(xPlayers) do - local xPlayer = type(v) == 'table' and v or ESX.GetPlayerFromId(v) + for i=1, #xPlayers do + local xPlayer = xPlayers[i] MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { ['@identifier'] = xPlayer.identifier }, function(result) @@ -22,7 +21,7 @@ AddEventHandler('onResourceStart', function(resourceName) end xPlayer.set('status', data) - TriggerClientEvent('esx_status:load', k, data) + TriggerClientEvent('esx_status:load', xPlayer.source, data) end) end end) @@ -100,10 +99,10 @@ function SaveData() local firstItem = true local playerCount = 0 - local xPlayers = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers() + local xPlayers = ESX.GetExtendedPlayers() - for k,v in pairs(xPlayers) do - local xPlayer = type(v) == 'table' and v or ESX.GetPlayerFromId(v) + for i=1, #xPlayers do + local xPlayer = xPlayers[i] local status = xPlayer.get('status') whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', xPlayer.identifier, json.encode(status)) diff --git a/[esx_addons]/esx_whitelist/server/main.lua b/[esx_addons]/esx_whitelist/server/main.lua index c7b8bda8..34564eb3 100644 --- a/[esx_addons]/esx_whitelist/server/main.lua +++ b/[esx_addons]/esx_whitelist/server/main.lua @@ -22,12 +22,12 @@ MySQL.ready(function() end) AddEventHandler('playerConnecting', function(name, setCallback, deferrals) - local xPlayers = ESX.GetPlayers() + local xPlayers = ESX.GetExtendedPlayers() -- Mark this connection as deferred, this is to prevent problems while checking player identifiers. deferrals.defer() - local playerId, kickReason, identifier = source + local playerId, kickReason = source -- Letting the user know what's going on. deferrals.update(_U('whitelist_check')) @@ -35,12 +35,7 @@ AddEventHandler('playerConnecting', function(name, setCallback, deferrals) -- Needed, not sure why. Citizen.Wait(100) - for k,v in ipairs(GetPlayerIdentifiers(playerId)) do - if string.match(v, 'license:') then - identifier = string.sub(v, 9) - break - end - end + local identifier = ESX.GetIdentifier(playerId) if ESX.Table.SizeOf(WhiteList) == 0 then kickReason = _U('whitelist_empty') diff --git a/server.cfg b/server.cfg index 8381daef..44fa633e 100644 --- a/server.cfg +++ b/server.cfg @@ -44,7 +44,6 @@ add_ace resource.es_extended command.stop allow ## ESX Legacy ensure mysql-async ensure cron -ensure instance ensure skinchanger ensure es_extended ensure esx_menu_default