From a8ab102bae62c6ede206705ca675b41507d3d61b Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Thu, 25 May 2023 14:56:15 +1000 Subject: [PATCH] refactor(imports/streaming): use coroutine.isyieldable --- imports/requestAnimDict/client.lua | 2 +- imports/requestAnimSet/client.lua | 2 +- imports/requestModel/client.lua | 2 +- imports/requestNamedPtfxAsset/client.lua | 2 +- imports/requestScaleformMovie/client.lua | 4 ++-- imports/requestStreamedTextureDict/client.lua | 2 +- imports/requestWeaponAsset/client.lua | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/imports/requestAnimDict/client.lua b/imports/requestAnimDict/client.lua index a58f5b4..5b6d1d5 100644 --- a/imports/requestAnimDict/client.lua +++ b/imports/requestAnimDict/client.lua @@ -15,7 +15,7 @@ function lib.requestAnimDict(animDict, timeout) RequestAnimDict(animDict) - if coroutine.running() then + if coroutine.isyieldable() then timeout = tonumber(timeout) or 500 for _ = 1, timeout do diff --git a/imports/requestAnimSet/client.lua b/imports/requestAnimSet/client.lua index 5f54a72..bb7c884 100644 --- a/imports/requestAnimSet/client.lua +++ b/imports/requestAnimSet/client.lua @@ -11,7 +11,7 @@ function lib.requestAnimSet(animSet, timeout) RequestAnimSet(animSet) - if coroutine.running() then + if coroutine.isyieldable() then timeout = tonumber(timeout) or 500 for _ = 1, timeout do diff --git a/imports/requestModel/client.lua b/imports/requestModel/client.lua index 88b5677..bdb564e 100644 --- a/imports/requestModel/client.lua +++ b/imports/requestModel/client.lua @@ -13,7 +13,7 @@ function lib.requestModel(model, timeout) RequestModel(model) - if coroutine.running() then + if coroutine.isyieldable() then timeout = tonumber(timeout) or 500 for _ = 1, timeout do diff --git a/imports/requestNamedPtfxAsset/client.lua b/imports/requestNamedPtfxAsset/client.lua index 0fe9dc1..8b86ae1 100644 --- a/imports/requestNamedPtfxAsset/client.lua +++ b/imports/requestNamedPtfxAsset/client.lua @@ -11,7 +11,7 @@ function lib.requestNamedPtfxAsset(ptFxName, timeout) RequestNamedPtfxAsset(ptFxName) - if coroutine.running() then + if coroutine.isyieldable() then timeout = tonumber(timeout) or 500 for _ = 1, timeout do diff --git a/imports/requestScaleformMovie/client.lua b/imports/requestScaleformMovie/client.lua index 9a5afca..afebc78 100644 --- a/imports/requestScaleformMovie/client.lua +++ b/imports/requestScaleformMovie/client.lua @@ -11,7 +11,7 @@ function lib.requestScaleformMovie(scaleformName, timeout) if HasScaleformMovieLoaded(scaleform) then return scaleform end - if coroutine.running() then + if coroutine.isyieldable() then timeout = tonumber(timeout) or 500 for _ = 1, timeout do @@ -28,4 +28,4 @@ function lib.requestScaleformMovie(scaleformName, timeout) return scaleform end -return lib.requestScaleformMovie \ No newline at end of file +return lib.requestScaleformMovie diff --git a/imports/requestStreamedTextureDict/client.lua b/imports/requestStreamedTextureDict/client.lua index 4b47505..6edad84 100644 --- a/imports/requestStreamedTextureDict/client.lua +++ b/imports/requestStreamedTextureDict/client.lua @@ -11,7 +11,7 @@ function lib.requestStreamedTextureDict(textureDict, timeout) RequestStreamedTextureDict(textureDict, false) - if coroutine.running() then + if coroutine.isyieldable() then timeout = tonumber(timeout) or 500 for _ = 1, timeout do diff --git a/imports/requestWeaponAsset/client.lua b/imports/requestWeaponAsset/client.lua index 8489a39..ea2dc9f 100644 --- a/imports/requestWeaponAsset/client.lua +++ b/imports/requestWeaponAsset/client.lua @@ -40,7 +40,7 @@ function lib.requestWeaponAsset(weaponType, timeout, weaponResourceFlags, extraW RequestWeaponAsset(weaponType, weaponResourceFlags or 31, extraWeaponComponentFlags or 0) - if coroutine.running() then + if coroutine.isyieldable() then timeout = tonumber(timeout) or 500 for _ = 1, timeout do