Skip to content
Permalink
Browse files
Make receptor_on/off overwritable, fix a serious bug.
  • Loading branch information
Ekdohibs committed Jan 11, 2014
1 parent c8ef37f commit fe50e87da17acafb6e869ca94bd4716cc97eb165
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
@@ -38,7 +38,7 @@ function mesecon.queue:add_action(pos, func, params, time, overwritecheck, prior
end

if (toremove ~= nil) then
table.remove(mesecon.queue.actions, i)
table.remove(mesecon.queue.actions, toremove)
end

table.insert(mesecon.queue.actions, action)
@@ -84,7 +84,7 @@ mesecon.queue:add_function("receptor_on", function (pos, rules)
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})
mesecon.queue:add_action(pos, "receptor_on", {rules}, nil, rules)
return
end
end
@@ -100,7 +100,7 @@ mesecon.queue:add_function("receptor_on", function (pos, rules)
end)

function mesecon:receptor_on(pos, rules)
mesecon.queue:add_action(pos, "receptor_on", {rules})
mesecon.queue:add_action(pos, "receptor_on", {rules}, nil, rules)
end

mesecon.queue:add_function("receptor_off", function (pos, rules)
@@ -110,7 +110,7 @@ mesecon.queue:add_function("receptor_off", function (pos, rules)
for _, rule in ipairs(mesecon:flattenrules(rules)) do
local np = mesecon:addPosRule(pos, rule)
if minetest.get_node_or_nil(np) == nil then
mesecon.queue:add_action(pos, "receptor_off", {rules})
mesecon.queue:add_action(pos, "receptor_off", {rules}, nil, rules)
return
end
end
@@ -122,14 +122,14 @@ mesecon.queue:add_function("receptor_off", function (pos, rules)
if not mesecon:connected_to_receptor(np, mesecon:invertRule(rule)) then
mesecon:turnoff(np, rulename)
else
mesecon:changesignal(np, minetest.get_node(np), rulename, mesecon.state.off, 1)
mesecon:changesignal(np, minetest.get_node(np), rulename, mesecon.state.off, 2)
end
end
end
end)

function mesecon:receptor_off(pos, rules)
mesecon.queue:add_action(pos, "receptor_off", {rules})
mesecon.queue:add_action(pos, "receptor_off", {rules}, nil, rules)
end


0 comments on commit fe50e87

Please sign in to comment.