diff options
author | Alexander Ried <ried@mytum.de> | 2020-06-22 06:41:30 +0000 |
---|---|---|
committer | groxxda <ried@mytum.de> | 2020-06-30 10:11:22 +0000 |
commit | c79e68a80c2aec939143af99b15173c05d067d2b (patch) | |
tree | ecba5c01de2135a46e97b2b8dfe968ab176f3007 /item_transport.lua | |
parent | 9338c109a6aa5c8c160b18f2ebd7da773bfb7a66 (diff) | |
download | pipeworks-c79e68a80c2aec939143af99b15173c05d067d2b.tar pipeworks-c79e68a80c2aec939143af99b15173c05d067d2b.tar.gz pipeworks-c79e68a80c2aec939143af99b15173c05d067d2b.tar.bz2 pipeworks-c79e68a80c2aec939143af99b15173c05d067d2b.tar.xz pipeworks-c79e68a80c2aec939143af99b15173c05d067d2b.zip |
Consider connect_sides for item transport
Previously connect_sides was only used to choose the correct visual
model, but not during item transport. This allowed items to exit tubes
in directions without a visual connection and enter objects from sides
that should not be connectable according to connect_sides.
For example an item could enter a chest from the front, if a tube passed
there.
This change saves the connect_sides in the meta table of the object
whenever the visual representation is updated. When nothing is cached
yet, it uses the old behavior. That way it does not break existing
builds.
Diffstat (limited to 'item_transport.lua')
-rw-r--r-- | item_transport.lua | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/item_transport.lua b/item_transport.lua index 7f9e241..f4067d8 100644 --- a/item_transport.lua +++ b/item_transport.lua @@ -25,7 +25,7 @@ end -- both optional w/ sensible defaults and fallback to normal allow_* function -- XXX: possibly change insert_object to insert_item -local adjlist={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=0,y=1,z=0},{x=0,y=-1,z=0},{x=1,y=0,z=0},{x=-1,y=0,z=0}} +local default_adjlist={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=0,y=1,z=0},{x=0,y=-1,z=0},{x=1,y=0,z=0},{x=-1,y=0,z=0}} function pipeworks.notvel(tbl, vel) local tbl2={} @@ -80,6 +80,9 @@ local function go_next_compat(pos, cnode, cmeta, cycledir, vel, stack, owner) if minetest.registered_nodes[cnode.name] and minetest.registered_nodes[cnode.name].tube and minetest.registered_nodes[cnode.name].tube.can_go then can_go = minetest.registered_nodes[cnode.name].tube.can_go(pos, cnode, vel, stack) else + local adjlist_string = minetest.get_meta(pos):get_string("adjlist") + local adjlist = minetest.deserialize(adjlist_string) or default_adjlist -- backward compat: if not found, use old behavior: all directions + can_go = pipeworks.notvel(adjlist, vel) end -- can_go() is expected to return an array-like table of candidate offsets. |