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

Added timeout on HasCollisionLoadedAroundEntity()

Browse Source
This commit is contained in:
ElPumpo
2020-04-12 18:11:35 +02:00
parent ddd3a88336
commit d707b60493
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/functions.lua
+16 -10
View File
@@ -304,9 +304,12 @@ end
ESX.Game.Teleport = function(entity, coords, cb)
if DoesEntityExist(entity) then
RequestCollisionAtCoord(coords.x, coords.y, coords.z)
local timeout = 0
while not HasCollisionLoadedAroundEntity(entity) do
-- we can get stuck here if any of the axies are "invalid"
while not HasCollisionLoadedAroundEntity(entity) and timeout < 2000 do
Citizen.Wait(0)
timeout = timeout + 1
end
SetEntityCoords(entity, coords.x, coords.y, coords.z, false, false, false, false)
@@ -366,22 +369,23 @@ ESX.Game.SpawnVehicle = function(modelName, coords, heading, cb)
ESX.Streaming.RequestModel(model)
local vehicle = CreateVehicle(model, coords.x, coords.y, coords.z, heading, true, false)
local id = NetworkGetNetworkIdFromEntity(vehicle)
local networkId = NetworkGetNetworkIdFromEntity(vehicle)
local timeout = 0
SetNetworkIdCanMigrate(id, true)
SetNetworkIdCanMigrate(networkId, true)
SetEntityAsMissionEntity(vehicle, true, false)
SetVehicleHasBeenOwnedByPlayer(vehicle, true)
SetVehicleNeedsToBeHotwired(vehicle, false)
SetVehRadioStation(vehicle, 'OFF')
SetModelAsNoLongerNeeded(model)
RequestCollisionAtCoord(coords.x, coords.y, coords.z)
while not HasCollisionLoadedAroundEntity(vehicle) do
-- we can get stuck here if any of the axies are "invalid"
while not HasCollisionLoadedAroundEntity(vehicle) and timeout < 2000 do
Citizen.Wait(0)
timeout = timeout + 1
end
SetVehRadioStation(vehicle, 'OFF')
if cb then
cb(vehicle)
end
@@ -395,19 +399,21 @@ ESX.Game.SpawnLocalVehicle = function(modelName, coords, heading, cb)
ESX.Streaming.RequestModel(model)
local vehicle = CreateVehicle(model, coords.x, coords.y, coords.z, heading, false, false)
local timeout = 0
SetEntityAsMissionEntity(vehicle, true, false)
SetVehicleHasBeenOwnedByPlayer(vehicle, true)
SetVehicleNeedsToBeHotwired(vehicle, false)
SetVehRadioStation(vehicle, 'OFF')
SetModelAsNoLongerNeeded(model)
RequestCollisionAtCoord(coords.x, coords.y, coords.z)
while not HasCollisionLoadedAroundEntity(vehicle) do
-- we can get stuck here if any of the axies are "invalid"
while not HasCollisionLoadedAroundEntity(vehicle) and timeout < 2000 do
Citizen.Wait(0)
timeout = timeout + 1
end
SetVehRadioStation(vehicle, 'OFF')
if cb then
cb(vehicle)
end