Mirrorlandia_minetest/techpack
1
0
Fork 0
mirror of https://github.com/joe7575/techpack.git synced 2024-11-26 00:53:44 +01:00
Code Issues Projects Releases Wiki Activity

Clumsy on_push testing replaced with new method

Browse Source
This commit is contained in:
Cam B 2021-01-21 00:18:22 +00:00
parent 2af68b9f18
commit 1b5f83116c
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tubelib/command.lua
View File

@ -403,23 +403,22 @@ function tubelib.pull_items(pos, side, player_name)
local npos, nside, name = get_dest_node(pos, side) local npos, nside, name = get_dest_node(pos, side)
if npos == nil then return end if npos == nil then return end
if tubelib_NodeDef[name] and tubelib_NodeDef[name].on_pull_item then if tubelib_NodeDef[name] and tubelib_NodeDef[name].on_pull_item then
if Tube:is_valid_side(name, nside) == false then
return false
end
return tubelib_NodeDef[name].on_pull_item(npos, nside, player_name) return tubelib_NodeDef[name].on_pull_item(npos, nside, player_name)
end end
return nil return nil
end end
function tubelib.push_items(pos, side, items, player_name) function tubelib.push_items(pos, side, items, player_name)
local npos, nside, name = get_dest_node(pos, side) local npos, nside, name = get_dest_node(pos, side)
if npos == nil then return end if npos == nil then return end
local _,node = Tube:get_node(pos)
local dir = side_to_dir(side, node.param2)
local node, _, valid = Tube:get_secondary_node(pos, dir)
if node and not valid then
return false
end
if tubelib_NodeDef[name] and tubelib_NodeDef[name].on_push_item then if tubelib_NodeDef[name] and tubelib_NodeDef[name].on_push_item then
if Tube:is_valid_side(name, nside) == false then
return false
end
return tubelib_NodeDef[name].on_push_item(npos, nside, items, player_name) return tubelib_NodeDef[name].on_push_item(npos, nside, items, player_name)
elseif name == "air" then elseif name == "air" then
minetest.add_item(npos, items) minetest.add_item(npos, items)
@ -440,7 +439,11 @@ end
function tubelib.pull_stack(pos, side, player_name) function tubelib.pull_stack(pos, side, player_name)
local npos, nside, name = get_dest_node(pos, side) local npos, nside, name = get_dest_node(pos, side)
if npos == nil then return end if npos == nil then return end
if tubelib_NodeDef[name] then if tubelib_NodeDef[name] then
if Tube:is_valid_side(name, nside) == false then
return false
end
if tubelib_NodeDef[name].on_pull_stack then if tubelib_NodeDef[name].on_pull_stack then
return tubelib_NodeDef[name].on_pull_stack(npos, nside, player_name) return tubelib_NodeDef[name].on_pull_stack(npos, nside, player_name)
elseif tubelib_NodeDef[name].on_pull_item then elseif tubelib_NodeDef[name].on_pull_item then