mirror of
https://github.com/jimathy/jim_bridge.git
synced 2026-08-17 05:56:02 +01:00
Rewrite waitForSharedLoad() to fix issues
This commit is contained in:
@@ -193,14 +193,13 @@ end
|
|||||||
|
|
||||||
local messageShown = false
|
local messageShown = false
|
||||||
function waitForSharedLoad()
|
function waitForSharedLoad()
|
||||||
local timeout = 100000 -- 10 seconds in milliseconds
|
local timeout = GetGameTimer() + 900000 -- 15 minutes max wait (had to up this from 2 minutes because of slow servers)
|
||||||
local startTime = GetGameTimer()
|
|
||||||
local loaded = true
|
|
||||||
local loop = 0
|
local loop = 0
|
||||||
|
|
||||||
while ((not Jobs or not next(Jobs)) or
|
while ((not Jobs or not next(Jobs)) or
|
||||||
(not Items or not next(Items)) or
|
(not Items or not next(Items)) or
|
||||||
(not Vehicles or not next(Vehicles))
|
(not Vehicles or not next(Vehicles))
|
||||||
) and ((GetGameTimer() - startTime) < timeout) do
|
) and (timeout and GetGameTimer() < timeout) do
|
||||||
if loop >= 3 and not messageShown then
|
if loop >= 3 and not messageShown then
|
||||||
if (not Jobs or not next(Jobs)) then
|
if (not Jobs or not next(Jobs)) then
|
||||||
print("^4Debug^7: ^2Waiting for ^7Jobs^2 to be loaded")
|
print("^4Debug^7: ^2Waiting for ^7Jobs^2 to be loaded")
|
||||||
@@ -213,19 +212,16 @@ function waitForSharedLoad()
|
|||||||
end
|
end
|
||||||
messageShown = true
|
messageShown = true
|
||||||
end
|
end
|
||||||
--print((GetGameTimer() - startTime) < timeout)
|
|
||||||
Wait(1000)
|
Wait(1000)
|
||||||
if Jobs and Items and Vehicles then
|
|
||||||
--print("^6Bridge^7: ^2Jobs, Items, and Vehicles Loaded^7.")
|
|
||||||
loaded = true
|
|
||||||
break
|
|
||||||
end
|
|
||||||
loop += 1
|
loop += 1
|
||||||
end
|
end
|
||||||
if not loaded then
|
|
||||||
|
if Jobs and Items and Vehicles then
|
||||||
|
debugPrint("^6Bridge^7: ^2Jobs, Items, and Vehicles Loaded^7.")
|
||||||
|
return true
|
||||||
|
else
|
||||||
print("^4Error^7: ^1Timeout reached while waiting for shared load^7.")
|
print("^4Error^7: ^1Timeout reached while waiting for shared load^7.")
|
||||||
return false
|
return false
|
||||||
else
|
|
||||||
return true
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
Reference in New Issue
Block a user