From bc1fc8bcff7842cd5a3b2446a805f599848c0afa Mon Sep 17 00:00:00 2001 From: LivedBackwardss Date: Sun, 15 Dec 2024 15:03:20 -0800 Subject: [PATCH 1/3] fix(es_extended/server/functions): Core.IsPlayerAdmin returning false --- [core]/es_extended/server/functions.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua index 606ab0e7..6f4453c9 100644 --- a/[core]/es_extended/server/functions.lua +++ b/[core]/es_extended/server/functions.lua @@ -610,6 +610,6 @@ function Core.IsPlayerAdmin(playerId) return true end - local xPlayer = ESX.Players[playerId] - return (xPlayer and Config.AdminGroups[xPlayer.group] and true) or false + local xPlayer = ESX.Players[tonumber(playerId)] + return xPlayer and Config.AdminGroups[xPlayer.group] or false end From 00eafee422de29071465a8f194ba5e2cd18ff123 Mon Sep 17 00:00:00 2001 From: Kasey FItton Date: Mon, 16 Dec 2024 21:43:26 +0000 Subject: [PATCH 2/3] fix(es_extended/server/onesync): better vehicle spawning method --- [core]/es_extended/server/modules/onesync.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/[core]/es_extended/server/modules/onesync.lua b/[core]/es_extended/server/modules/onesync.lua index cb914a17..de4f4eb8 100644 --- a/[core]/es_extended/server/modules/onesync.lua +++ b/[core]/es_extended/server/modules/onesync.lua @@ -107,10 +107,10 @@ function ESX.OneSync.SpawnVehicle(model, coords, heading, properties, cb) local createdVehicle = CreateVehicleServerSetter(vehicleModel, vehicleType, coords.x, coords.y, coords.z, heading) local tries = 0 - while not createdVehicle or createdVehicle == 0 or not GetEntityCoords(createdVehicle) do + while not createdVehicle or createdVehicle == 0 or NetworkGetEntityOwner(createdVehicle) == -1 do Wait(200) tries = tries + 1 - if tries > 20 then + if tries > 40 then if promise then return promise:reject(("Could not spawn vehicle - ^5%s^7!"):format(model)) end @@ -122,6 +122,7 @@ function ESX.OneSync.SpawnVehicle(model, coords, heading, properties, cb) SetEntityOrphanMode(createdVehicle, 2) local networkId = NetworkGetNetworkIdFromEntity(createdVehicle) Entity(createdVehicle).state:set("VehicleProperties", vehicleProperties, true) + if promise then promise:resolve(networkId) elseif cb then From ddf43c0a6b37cfc53e0ff6324fe5e347fa20c576 Mon Sep 17 00:00:00 2001 From: Kasey Fitton Date: Mon, 16 Dec 2024 21:45:04 +0000 Subject: [PATCH 3/3] Revert "fix(es_extended/server/functions): Core.IsPlayerAdmin returning false" --- [core]/es_extended/server/functions.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua index 6f4453c9..606ab0e7 100644 --- a/[core]/es_extended/server/functions.lua +++ b/[core]/es_extended/server/functions.lua @@ -610,6 +610,6 @@ function Core.IsPlayerAdmin(playerId) return true end - local xPlayer = ESX.Players[tonumber(playerId)] - return xPlayer and Config.AdminGroups[xPlayer.group] or false + local xPlayer = ESX.Players[playerId] + return (xPlayer and Config.AdminGroups[xPlayer.group] and true) or false end