starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-09-01 10:48:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

better oneysnc infinity support

Browse Source
This commit is contained in:
Mycroft
2022-08-10 06:14:08 +01:00
parent 64e23573c9
commit 4eb998b0e5
2 changed files with 24 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[esx]/es_extended/client/functions.lua
+5 -5
View File
@@ -440,6 +440,7 @@ function ESX.Game.SpawnObject(object, coords, cb, networked)
local obj = NetworkGetEntityFromNetworkId(NetworkID)
local Tries = 0
while not DoesEntityExist(obj) do
obj = NetworkGetEntityFromNetworkId(NetworkID)
Wait(0)
Tries += 1
if Tries > 250 then
@@ -484,20 +485,19 @@ function ESX.Game.SpawnVehicle(vehicle, coords, heading, cb, networked)
if networked then
local isAutomobile = IsThisModelACar(model)
if isAutomobile ~= false then isAutomobile = true end
ESX.TriggerServerCallback('esx:Onesync:SpawnVehicle', function(NetID)
ESX.TriggerServerCallback('esx:Onesync:SpawnVehicle',function(NetID)
print("Spawned Vehicle: " .. NetID)
if NetID then
Wait(250)
local vehicle = NetworkGetEntityFromNetworkId(NetID)
local Tries = 0
while not DoesEntityExist(vehicle) do
vehicle = NetworkGetEntityFromNetworkId(NetID)
Wait(0)
Tries += 1
if Tries > 300 then
if Tries > 250 then
break
end
end
print("Spawned Vehicle: " .. vehicle)
SetEntityAsMissionEntity(vehicle, true, true)
SetVehicleHasBeenOwnedByPlayer(vehicle, true)
SetVehicleNeedsToBeHotwired(vehicle, false)
@@ -507,7 +507,7 @@ function ESX.Game.SpawnVehicle(vehicle, coords, heading, cb, networked)
cb(vehicle)
end
end
end, vehicle, coords, heading, isAutomobile)
end, model, vector, heading, isAutomobile)
else
CreateThread(function()
ESX.Streaming.RequestModel(model)
[esx]/es_extended/server/onesync.lua
+19 -33
View File
@@ -59,50 +59,28 @@ end
---@param coords vector3|table
---@param heading number
---@param cb function
function ESX.OneSync.SpawnVehicle(model, coords, heading, autoMobile)
function ESX.OneSync.SpawnVehicle(model, coords, heading, autoMobile, cb)
if type(model) == 'string' then model = GetHashKey(model) end
local vector = type(coords) == "vector3" and coords or vec(coords.x, coords.y, coords.z)
if type(autoMobile) ~= 'boolean' then
return
end
local entity = autoMobile and Citizen.InvokeNative(`CREATE_AUTOMOBILE`, model, coords.x, coords.y, coords.z, heading) or CreateVehicle(model, coords, heading, true, true)
-- Sometimes peds can spawn in the vehicle
local ped = GetPedInVehicleSeat(entity, -1)
if ped > 0 then
for i = -1, 6 do
ped = GetPedInVehicleSeat(entity, i)
local popType = GetEntityPopulationType(ped)
if popType <= 5 or popType >= 1 then
DeleteEntity(ped)
end
end
end
print('Spawned vehicle: ' .. entity)
local tries = 0
while not DoesEntityExist(entity) do
Wait(0)
tries = tries + 1
if tries > 250 then
break
end
end
print(DoesEntityExist(entity) and NetworkGetNetworkIdFromEntity(entity) or false)
return DoesEntityExist(entity) and NetworkGetNetworkIdFromEntity(entity) or false
local Entity = autoMobile and Citizen.InvokeNative(`CREATE_AUTOMOBILE`, model, coords.x, coords.y, coords.z, heading) or CreateVehicle(model, coords, heading, true, true)
cb(NetworkGetNetworkIdFromEntity(Entity))
end
---@param model number|string
---@param coords vector3|table
---@param heading number
---@param cb function
function ESX.OneSync.SpawnObject(model, coords, heading)
function ESX.OneSync.SpawnObject(model, coords, heading, cb)
if type(model) == 'string' then model = GetHashKey(model) end
local vector = type(coords) == "vector3" and coords or vec(coords.x, coords.y, coords.z)
CreateThread(function()
local entity = CreateObject(model, coords, true, true)
while not DoesEntityExist(entity) do Wait(50) end
SetEntityHeading(entity, heading)
return DoesEntityExist(entity) and NetworkGetNetworkIdFromEntity(entity) or false
cb(NetworkGetNetworkIdFromEntity(entity))
end)
end
@@ -169,7 +147,7 @@ end
---@param maxDistance number
---@param modelFilter table models to ignore, where the key is the model hash and the value is true
---@return table
function ESX.OneSync.GetVehiclesInArea(coords, maxDistance, modelFilter)
function ESX.OneSync.GetVehiclesInArea(coords, maxDistance, modelFilter, cb)
return getNearbyEntities(GetAllVehicles(), coords, modelFilter, maxDistance)
end
@@ -212,8 +190,16 @@ function ESX.OneSync.GetClosestVehicle(coords, modelFilter)
return getClosestEntity(GetAllVehicles(), coords, modelFilter)
end
for k,v in pairs(ESX.OneSync) do
ESX.RegisterServerCallback("esx:Onesync:"..k, function(source, cb, ...)
cb(v(...))
end)
end
ESX.RegisterServerCallback("esx:Onesync:SpawnVehicle", function(source, cb, model, coords, heading, autoMobile)
ESX.OneSync.SpawnVehicle(model, coords, heading, autoMobile, cb)
end)
ESX.RegisterServerCallback("esx:Onesync:SpawnObject", function(source, cb, model, coords, heading)
ESX.OneSync.SpawnObject(model, coords, heading, cb)
end)
-- for k,v in pairs(ESX.OneSync) do
-- ESX.RegisterServerCallback("esx:Onesync:"..k, function(source, cb, ...)
-- cb(v(...))
-- end)
-- end