From e43d694c36ddba363c77c591af3047538c45e2cc Mon Sep 17 00:00:00 2001
From: Kenshin13 <63159154+Kenshiin13@users.noreply.github.com>
Date: Sat, 14 Jun 2025 22:12:37 +0200
Subject: [PATCH] fix(es_extended/server/modules/onesync): only await net owner
 if valid player is nearby

---
 [core]/es_extended/server/modules/onesync.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/[core]/es_extended/server/modules/onesync.lua b/[core]/es_extended/server/modules/onesync.lua
index 8c5c76d3..c807f4f8 100644
--- a/[core]/es_extended/server/modules/onesync.lua
+++ b/[core]/es_extended/server/modules/onesync.lua
@@ -110,8 +110,8 @@ function ESX.OneSync.SpawnVehicle(vehicleModel, coords, heading, vehicleProperti
     end
 
     CreateThread(function()
+        local xPlayer = ESX.OneSync.GetClosestPlayer(coords, 300)
         if not vehicleType then
-            local xPlayer = ESX.OneSync.GetClosestPlayer(coords, 300)
             if not xPlayer then
                 return reject("No players found nearby to check vehicle type!")
             end
@@ -125,7 +125,9 @@ function ESX.OneSync.SpawnVehicle(vehicleModel, coords, heading, vehicleProperti
         local createdVehicle = CreateVehicleServerSetter(vehicleModel, vehicleType, coords.x, coords.y, coords.z, heading)
         local tries = 0
 
-        while not createdVehicle or createdVehicle == 0 or NetworkGetEntityOwner(createdVehicle) == -1 do
+        while not createdVehicle or createdVehicle == 0
+        or (xPlayer and NetworkGetEntityOwner(createdVehicle) == -1)
+        or (not xPlayer and not DoesEntityExist(createdVehicle)) do
             Wait(200)
             tries = tries + 1
             if tries > 40 then