Remove all traces of all_pull_sticky

This commit is contained in:
Wuzzy 2020-12-03 14:21:25 +01:00
parent 8dddfe17db
commit 356977531e

View File

@ -126,7 +126,7 @@ local function is_available(pos)
end end
function mesecon.mvps_get_stack(pos, dir, maximum, piston_pos, all_pull_sticky) function mesecon.mvps_get_stack(pos, dir, maximum, piston_pos)
-- determine the number of nodes to be pushed -- determine the number of nodes to be pushed
local nodes = {} local nodes = {}
local frontiers = {pos} local frontiers = {pos}
@ -160,10 +160,6 @@ function mesecon.mvps_get_stack(pos, dir, maximum, piston_pos, all_pull_sticky)
table.insert(connected, vector.add(np, dir)) table.insert(connected, vector.add(np, dir))
if all_pull_sticky then
table.insert(connected, vector.subtract(np, dir))
end
-- Make sure there are no duplicates in frontiers / nodes before -- Make sure there are no duplicates in frontiers / nodes before
-- adding nodes in "connected" to frontiers -- adding nodes in "connected" to frontiers
for _, cp in ipairs(connected) do for _, cp in ipairs(connected) do
@ -220,9 +216,8 @@ end
-- pos: pos of mvps; stackdir: direction of building the stack -- pos: pos of mvps; stackdir: direction of building the stack
-- movedir: direction of actual movement -- movedir: direction of actual movement
-- maximum: maximum nodes to be pushed -- maximum: maximum nodes to be pushed
-- all_pull_sticky: All nodes are sticky in the direction that they are pulled from function mesecon.mvps_push_or_pull(pos, stackdir, movedir, maximum, player_name, piston_pos)
function mesecon.mvps_push_or_pull(pos, stackdir, movedir, maximum, player_name, piston_pos, all_pull_sticky) local nodes, has_loop = mesecon.mvps_get_stack(pos, movedir, maximum, piston_pos)
local nodes, has_loop = mesecon.mvps_get_stack(pos, movedir, maximum, piston_pos, all_pull_sticky)
if has_loop then if has_loop then
return false return false