epicknex/multi
1
0
Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects Releases 13 Wiki Activity

Fixed some stuff

Browse Source
This commit is contained in:
Ryan Ward 2020-03-10 12:56:56 -04:00
parent ed19da4994
commit f43abc885c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changes.md
View File

@ -118,6 +118,8 @@ Bug Fixes:
- Fixed Issue with connections not returning a connection_link - Fixed Issue with connections not returning a connection_link
- 1.14.3 - 1.14.3
- Fixed Issue with hold like methods not accepting `false` as a valid return - Fixed Issue with hold like methods not accepting `false` as a valid return
- 1.14.4
- Reverted `false not being valid. Broke many things needs to be reworked`
Going Forward: Going Forward:
--- ---

10
multi/init.lua
View File

@ -28,8 +28,8 @@ local thread = {}
if not _G["$multi"] then if not _G["$multi"] then
_G["$multi"] = {multi=multi,thread=thread} _G["$multi"] = {multi=multi,thread=thread}
end end
multi.Version = "14.1.3" multi.Version = "14.1.4"
multi._VERSION = "14.1.3" multi._VERSION = "14.1.4"
multi.stage = "stable" multi.stage = "stable"
multi.__index = multi multi.__index = multi
multi.Name = "multi.root" multi.Name = "multi.root"
@ -1751,7 +1751,7 @@ function multi.initThreads(justThreads)
end end
elseif threads[i] and threads[i].task == "hold" then --GOHERE elseif threads[i] and threads[i].task == "hold" then --GOHERE
t0,t1,t2,t3,t4,t5,t6 = threads[i].func() t0,t1,t2,t3,t4,t5,t6 = threads[i].func()
if t0~=nil then if t0 then
if t0==multi.NIL then if t0==multi.NIL then
t0 = nil t0 = nil
end end
@ -1765,7 +1765,7 @@ function multi.initThreads(justThreads)
end end
elseif threads[i] and threads[i].task == "holdF" then elseif threads[i] and threads[i].task == "holdF" then
t0,t1,t2,t3,t4,t5,t6 = threads[i].func() t0,t1,t2,t3,t4,t5,t6 = threads[i].func()
if t0~=nil then if t0 then
threads[i].task = "" threads[i].task = ""
threads[i].__ready = true threads[i].__ready = true
elseif clock() - threads[i].time>=threads[i].sec then elseif clock() - threads[i].time>=threads[i].sec then
@ -1777,7 +1777,7 @@ function multi.initThreads(justThreads)
elseif threads[i] and threads[i].task == "holdW" then elseif threads[i] and threads[i].task == "holdW" then
threads[i].pos = threads[i].pos + 1 threads[i].pos = threads[i].pos + 1
t0,t1,t2,t3,t4,t5,t6 = threads[i].func() t0,t1,t2,t3,t4,t5,t6 = threads[i].func()
if t0~=nil then if t0 then
threads[i].task = "" threads[i].task = ""
threads[i].__ready = true threads[i].__ready = true
elseif threads[i].count==threads[i].pos then elseif threads[i].count==threads[i].pos then