diff options
| author | root <root@linuxworks.belug.de> | 2017-10-19 14:21:27 +0200 |
|---|---|---|
| committer | root <root@linuxworks.belug.de> | 2017-10-19 14:21:27 +0200 |
| commit | 277154cf2daf870044c6f5bac90f338552fb75df (patch) | |
| tree | 9cc6bb59a684df55155d69fc1b1ec2c8c181e22c /filter-injector.lua | |
| parent | 848741a294363431a2a6e9c32ddf693951951fec (diff) | |
| parent | 9df0ec7edb55ba443acc68df9ed63fdd53c66bfa (diff) | |
Merge branch 'master' of https://github.com/minetest-mods/pipeworks
Diffstat (limited to 'filter-injector.lua')
| -rw-r--r-- | filter-injector.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/filter-injector.lua b/filter-injector.lua index c9d132f..0f651fb 100644 --- a/filter-injector.lua +++ b/filter-injector.lua @@ -115,7 +115,7 @@ local function grabAndFire(data,slotseq_mode,exmatch_mode,filtmeta,frominv,fromi local stack = frominv:get_stack(frominvname, spos) local doRemove = stack:get_count() if fromtube.can_remove then - doRemove = fromtube.can_remove(frompos, fromnode, stack, dir) + doRemove = fromtube.can_remove(frompos, fromnode, stack, dir, frominvname, spos) elseif fromdef.allow_metadata_inventory_take then doRemove = fromdef.allow_metadata_inventory_take(frompos, frominvname,spos, stack, fakePlayer) end @@ -146,7 +146,7 @@ local function grabAndFire(data,slotseq_mode,exmatch_mode,filtmeta,frominv,fromi end if fromtube.remove_items then -- it could be the entire stack... - item = fromtube.remove_items(frompos, fromnode, stack, dir, count) + item = fromtube.remove_items(frompos, fromnode, stack, dir, count, frominvname, spos) else item = stack:take_item(count) frominv:set_stack(frominvname, spos, stack) |