mff/pipeworks
1
0
Fork 0
forked from mtcontrib/pipeworks
Code Issues Pull Requests Releases Wiki Activity

fix filters and mese filters not working correctly

Browse Source
This commit is contained in:
Novatux 2013-12-24 08:29:33 -05:00 committed by Vanessa Ezekowitz
parent 10cf11e008
commit b040fc585b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
item_transport.lua
View File

@ -77,10 +77,11 @@ local function grabAndFire(frominv,frominvname,frompos,fromnode,sname,tube,idef,
item1:get_luaentity().start_pos = frompos item1:get_luaentity().start_pos = frompos
item1:setvelocity(dir) item1:setvelocity(dir)
item1:setacceleration({x=0, y=0, z=0}) item1:setacceleration({x=0, y=0, z=0})
return -- only fire one item, please return true-- only fire one item, please
end end
end end
end end
return false
end end
minetest.register_node("pipeworks:filter", { minetest.register_node("pipeworks:filter", {
@ -137,7 +138,7 @@ minetest.register_node("pipeworks:filter", {
sname = filter:get_name() sname = filter:get_name()
if sname ~= "" then if sname ~= "" then
-- XXX: that's a lot of parameters -- XXX: that's a lot of parameters
grabAndFire(frominv, frominvname, frompos, fromnode, sname, tube, idef, dir) if grabAndFire(frominv, frominvname, frompos, fromnode, sname, tube, idef, dir) then return end
end end
end end
if inv:is_empty("main") then if inv:is_empty("main") then
@ -203,11 +204,11 @@ minetest.register_node("pipeworks:mese_filter", {
for _,filter in ipairs(inv:get_list("main")) do for _,filter in ipairs(inv:get_list("main")) do
sname = filter:get_name() sname = filter:get_name()
if sname ~= "" then if sname ~= "" then
grabAndFire(frominv, frominvname, frompos, fromnode, sname, tube, idef, dir, true) if grabAndFire(frominv, frominvname, frompos, fromnode, sname, tube, idef, dir, true) then return end
end end
end end
if inv:is_empty("main") then if inv:is_empty("main") then
grabAndFire(frominv, frominvname, frompos, fromnode, sname, tube, idef, dir, true) grabAndFire(frominv, frominvname, frompos, fromnode, nil, tube, idef, dir, true)
end end
end, end,
}) })