From f43abc885c303e928f37a3295778f10b1b537ae3 Mon Sep 17 00:00:00 2001 From: Ryan Ward Date: Tue, 10 Mar 2020 12:56:56 -0400 Subject: [PATCH] Fixed some stuff --- changes.md | 2 ++ multi/init.lua | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/changes.md b/changes.md index d2fcf81..a9d3f30 100644 --- a/changes.md +++ b/changes.md @@ -118,6 +118,8 @@ Bug Fixes: - Fixed Issue with connections not returning a connection_link - 1.14.3 - 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: --- diff --git a/multi/init.lua b/multi/init.lua index 2c64ebf..5b08b35 100644 --- a/multi/init.lua +++ b/multi/init.lua @@ -28,8 +28,8 @@ local thread = {} if not _G["$multi"] then _G["$multi"] = {multi=multi,thread=thread} end -multi.Version = "14.1.3" -multi._VERSION = "14.1.3" +multi.Version = "14.1.4" +multi._VERSION = "14.1.4" multi.stage = "stable" multi.__index = multi multi.Name = "multi.root" @@ -1751,7 +1751,7 @@ function multi.initThreads(justThreads) end elseif threads[i] and threads[i].task == "hold" then --GOHERE t0,t1,t2,t3,t4,t5,t6 = threads[i].func() - if t0~=nil then + if t0 then if t0==multi.NIL then t0 = nil end @@ -1765,7 +1765,7 @@ function multi.initThreads(justThreads) end elseif threads[i] and threads[i].task == "holdF" then t0,t1,t2,t3,t4,t5,t6 = threads[i].func() - if t0~=nil then + if t0 then threads[i].task = "" threads[i].__ready = true 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 threads[i].pos = threads[i].pos + 1 t0,t1,t2,t3,t4,t5,t6 = threads[i].func() - if t0~=nil then + if t0 then threads[i].task = "" threads[i].__ready = true elseif threads[i].count==threads[i].pos then