summaryrefslogtreecommitdiff
path: root/mesecons/actionqueue.lua
diff options
context:
space:
mode:
authorJeija <jeija@mesecons.net>2014-01-19 13:57:11 +0100
committerJeija <jeija@mesecons.net>2014-01-19 13:57:11 +0100
commita632a8abc80155118708108d846f52bbc230f257 (patch)
treec5cd15411f885551a1a6330fc1166236db2847f2 /mesecons/actionqueue.lua
parenta6bd955449d16bb41d091dd2b701f358557bf038 (diff)
downloadmesecons-a632a8abc80155118708108d846f52bbc230f257.tar
mesecons-a632a8abc80155118708108d846f52bbc230f257.tar.gz
mesecons-a632a8abc80155118708108d846f52bbc230f257.tar.bz2
mesecons-a632a8abc80155118708108d846f52bbc230f257.tar.xz
mesecons-a632a8abc80155118708108d846f52bbc230f257.zip
Fix delayers and disable resuming if not using MESECONS_GLOBALSTEP
Diffstat (limited to 'mesecons/actionqueue.lua')
-rw-r--r--mesecons/actionqueue.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesecons/actionqueue.lua b/mesecons/actionqueue.lua
index 41a587c..cf74d47 100644
--- a/mesecons/actionqueue.lua
+++ b/mesecons/actionqueue.lua
@@ -20,7 +20,7 @@ function mesecon.queue:add_action(pos, func, params, time, overwritecheck, prior
priority=priority}
-- if not using the queue, (MESECONS_GLOBALSTEP off), just execute the function an we're done
- if not MESECONS_GLOBALSTEP then
+ if not MESECONS_GLOBALSTEP and action.time == 0 then
mesecon.queue:execute(action)
return
end
@@ -64,7 +64,7 @@ end
local m_time = 0
minetest.register_globalstep(function (dtime)
m_time = m_time + dtime
- if (m_time < 5) then return end -- don't even try if server has not been running for 2 seconds
+ if (m_time < MESECONS_RESUMETIME) then return end -- don't even try if server has not been running for XY seconds
local actions = mesecon:tablecopy(mesecon.queue.actions)
local actions_now={}