Skip to content

Add timeouts and validation to asset loaders #1219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GhzGarage merged 1 commit into from
May 13, 2026
+42 −13
Merged

Add timeouts and validation to asset loaders #1219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 42 additions & 13 deletions client/functions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,12 +356,23 @@ end

-- Vehicle

function QBCore.Functions.LoadModel(model)
if HasModelLoaded(model) then return end
RequestModel(model)
while not HasModelLoaded(model) do
function QBCore.Functions.LoadModel(model, timeout)
timeout = timeout or 5000
local modelName = model
if type(modelName) ~= 'number' then modelName = joaat(model) end
if HasModelLoaded(modelName) then return true, model end

if not IsModelValid(modelName) and not IsModelInCdimage(modelName) then
print(('[QBCore] Model does not exist: %s'):format(modelName or model))
return false, modelName
end

RequestModel(modelName)
local count = GetGameTimer() + timeout
while not HasModelLoaded(modelName) and GetGameTimer() < count do
Wait(0)
end
return HasModelLoaded(modelName), modelName
end

function QBCore.Functions.SpawnVehicle(model, cb, coords, isnetworked, teleportInto)
Expand Down Expand Up @@ -880,12 +891,20 @@ function QBCore.Functions.DrawText3D(x, y, z, text)
ClearDrawOrigin()
end

function QBCore.Functions.RequestAnimDict(animDict)
if HasAnimDictLoaded(animDict) then return end
function QBCore.Functions.RequestAnimDict(animDict, timeout)
timeout = timeout or 5000
if HasAnimDictLoaded(animDict) then return true, animDict end
if not DoesAnimDictExist(animDict) then
print(('[QBCore] Animation dictionary does not exist: %s'):format(animDict))
return false, animDict
end

RequestAnimDict(animDict)
while not HasAnimDictLoaded(animDict) do
local count = GetGameTimer() + timeout
while not HasAnimDictLoaded(animDict) and GetGameTimer() < count do
Wait(0)
end
return HasAnimDictLoaded(animDict), animDict
end

function QBCore.Functions.GetClosestBone(entity, list)
Expand Down Expand Up @@ -948,20 +967,30 @@ function QBCore.Functions.SpawnClear(coords, radius)
return true
end

function QBCore.Functions.LoadAnimSet(animSet)
if HasAnimSetLoaded(animSet) then return end
function QBCore.Functions.LoadAnimSet(animSet, timeout)
timeout = timeout or 5000
if HasAnimSetLoaded(animSet) then return true, animSet end
RequestAnimSet(animSet)
while not HasAnimSetLoaded(animSet) do

local count = GetGameTimer() + timeout
while not HasAnimSetLoaded(animSet) and GetGameTimer() < count do
Wait(0)
end

return HasAnimSetLoaded(animSet), animSet
end

function QBCore.Functions.LoadParticleDictionary(dictionary)
if HasNamedPtfxAssetLoaded(dictionary) then return end
function QBCore.Functions.LoadParticleDictionary(dictionary, timeout)
timeout = timeout or 5000
if HasNamedPtfxAssetLoaded(dictionary) then return true, dictionary end
RequestNamedPtfxAsset(dictionary)
while not HasNamedPtfxAssetLoaded(dictionary) do

local count = GetGameTimer() + timeout
while not HasNamedPtfxAssetLoaded(dictionary) and GetGameTimer() < count do
Wait(0)
end

return HasNamedPtfxAssetLoaded(dictionary), dictionary
end

function QBCore.Functions.StartParticleAtCoord(dict, ptName, looped, coords, rot, scale, alpha, color, duration)
Expand Down
Loading