summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeija <jeija@mesecons.net>2014-01-11 10:04:32 +0100
committerNovatux <nathanael.courant@laposte.net>2014-01-11 20:11:54 +0100
commitc8ef37f5226778e549924c49e6f1d7d19b285a29 (patch)
tree65d6c819c7eaceb713b85c25c0263834b3a154f4
parent1a492feb7a137a7acfe8cc4d5849970556478e40 (diff)
downloadmesecons-c8ef37f5226778e549924c49e6f1d7d19b285a29.tar
mesecons-c8ef37f5226778e549924c49e6f1d7d19b285a29.tar.gz
mesecons-c8ef37f5226778e549924c49e6f1d7d19b285a29.tar.bz2
mesecons-c8ef37f5226778e549924c49e6f1d7d19b285a29.tar.xz
mesecons-c8ef37f5226778e549924c49e6f1d7d19b285a29.zip
Actionqueue tweaks
-rw-r--r--mesecons/actionqueue.lua1
-rw-r--r--mesecons/init.lua2
2 files changed, 2 insertions, 1 deletions
diff --git a/mesecons/actionqueue.lua b/mesecons/actionqueue.lua
index 66e9fd7..03dedd2 100644
--- a/mesecons/actionqueue.lua
+++ b/mesecons/actionqueue.lua
@@ -12,7 +12,6 @@ function mesecon.queue:add_action(pos, func, params, time, overwritecheck, prior
-- Create Action Table:
time = time or 0 -- time <= 0 --> execute, time > 0 --> wait time until execution
priority = priority or 1
- overwritecheck = overwritecheck or {}
action = { pos=mesecon:tablecopy(pos),
func=func,
params=mesecon:tablecopy(params),
diff --git a/mesecons/init.lua b/mesecons/init.lua
index 523263d..fe3bbfd 100644
--- a/mesecons/init.lua
+++ b/mesecons/init.lua
@@ -82,6 +82,7 @@ mesecon.queue:add_function("receptor_on", function (pos, rules)
-- if area (any of the rule targets) is not loaded, keep trying and call this again later
for _, rule in ipairs(mesecon:flattenrules(rules)) do
local np = mesecon:addPosRule(pos, rule)
+ -- if area is not loaded, keep trying
if minetest.get_node_or_nil(np) == nil then
mesecon.queue:add_action(pos, "receptor_on", {rules})
return
@@ -110,6 +111,7 @@ mesecon.queue:add_function("receptor_off", function (pos, rules)
local np = mesecon:addPosRule(pos, rule)
if minetest.get_node_or_nil(np) == nil then
mesecon.queue:add_action(pos, "receptor_off", {rules})
+ return
end
end