improve spawnvehicle and remove callback

esx-framework · Sep 27, 2023 · 5eb3194 · 5eb3194
1 parent f904136
commit 5eb3194
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 34 deletions.
diff --git a/[core]/es_extended/client/functions.lua b/[core]/es_extended/client/functions.lua
@@ -336,34 +336,17 @@ end
 
 function ESX.Game.SpawnObject(object, coords, cb, networked)
     networked = networked == nil and true or networked
-    if networked then
-        ESX.TriggerServerCallback('esx:Onesync:SpawnObject', function(NetworkID)
-            if cb then
-                local obj = NetworkGetEntityFromNetworkId(NetworkID)
-                local Tries = 0
-                while not DoesEntityExist(obj) do
-                    obj = NetworkGetEntityFromNetworkId(NetworkID)
-                    Wait(0)
-                    Tries = Tries + 1
-                    if Tries > 250 then
-                        break
-                    end
-                end
-                cb(obj)
-            end
-        end, object, coords, 0.0)
-    else
-        local model = type(object) == 'number' and object or joaat(object)
-        local vector = type(coords) == "vector3" and coords or vec(coords.x, coords.y, coords.z)
-        CreateThread(function()
-            ESX.Streaming.RequestModel(model)
-
-            local obj = CreateObject(model, vector.xyz, networked, false, true)
-            if cb then
-                cb(obj)
-            end
-        end)
-    end
+
+    local model = type(object) == 'number' and object or joaat(object)
+    local vector = type(coords) == "vector3" and coords or vec(coords.x, coords.y, coords.z)
+    CreateThread(function()
+        ESX.Streaming.RequestModel(model)
+
+        local obj = CreateObject(model, vector.xyz, networked, false, true)
+        if cb then
+            cb(obj)
+        end
+    end)
 end
 
 function ESX.Game.SpawnLocalObject(object, coords, cb)

diff --git a/[core]/es_extended/server/onesync.lua b/[core]/es_extended/server/onesync.lua
@@ -86,8 +86,8 @@ function ESX.OneSync.SpawnVehicle(model, coords, heading, properties, cb)
 	local vehicleProperties = properties
 
 	CreateThread(function()
-		local xPlayer = ESX.OneSync.GetClosestPlayer(coords, 300)
-		ESX.GetVehicleType(vehicleModel, xPlayer.id, function(vehicleType)
+		local players = GetPlayers() 
+		ESX.GetVehicleType(vehicleModel, players[math.random(1, #players)], function(vehicleType)
 			if vehicleType then
 				local createdVehicle = CreateVehicleServerSetter(vehicleModel, vehicleType, coords, heading)
 				if not DoesEntityExist(createdVehicle) then
@@ -224,7 +224,3 @@ end
 function ESX.OneSync.GetClosestVehicle(coords, modelFilter)
 	return getClosestEntity(GetAllVehicles(), coords, modelFilter)
 end
-
-ESX.RegisterServerCallback("esx:Onesync:SpawnObject", function(_, cb, model, coords, heading)
-	ESX.OneSync.SpawnObject(model, coords, heading, cb)
-end)