update #39

Merged
milan merged 1 commit from develop into master 2021-08-14 17:54:46 +02:00
9 changed files with 45 additions and 27 deletions
Showing only changes of commit a887fcaaf2 - Show all commits

View file

@ -0,0 +1,3 @@
Mythrodak (fixed)
Christian_Soldier
CC 0 (1.0)

View file

@ -0,0 +1,3 @@
BadBoyHalo (fixed)
Christian_Soldier
CC 0 (1.0)

View file

@ -0,0 +1,3 @@
Sapnap (fixed)
Christian_Soldier
CC 0 (1.0)

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

View file

@ -508,6 +508,9 @@ tubelib.register_node("tubelib_addons3:distributor",
on_pull_item = function(pos, side) on_pull_item = function(pos, side)
return tubelib.get_item(M(pos), "src") return tubelib.get_item(M(pos), "src")
end, end,
on_pull_stack = function(pos, side)
return tubelib.get_stack(M(pos), "src")
end,
on_push_item = function(pos, side, item) on_push_item = function(pos, side, item)
return tubelib.put_item(M(pos), "src", item) return tubelib.put_item(M(pos), "src", item)
end, end,

View file

@ -110,7 +110,8 @@ local function shift_items(pos, elapsed)
for i = 0,7 do for i = 0,7 do
local idx = ((i + offs) % 8) + 1 local idx = ((i + offs) % 8) + 1
local stack = inv:get_stack("shift", idx) local stack = inv:get_stack("shift", idx)
if stack:get_count() > 0 then local count = stack:get_count()
if count > 0 then
if tubelib.push_items(pos, "R", stack, player_name) then if tubelib.push_items(pos, "R", stack, player_name) then
-- The effort is needed here for the case the -- The effort is needed here for the case the
-- pusher pushes into its own chest. -- pusher pushes into its own chest.
@ -121,7 +122,12 @@ local function shift_items(pos, elapsed)
aging(pos, meta) aging(pos, meta)
return true return true
else else
set_state(meta, "blocked") -- Complete stack rejected
if count == stack:get_count() then
set_state(meta, "blocked")
else
inv:set_stack("shift", idx, stack)
end
end end
end end
end end

View file

@ -105,7 +105,7 @@ function ts_doors.register_door(item, description, texture, sounds, recipe)
local groups = minetest.registered_nodes[item].groups local groups = minetest.registered_nodes[item].groups
local door_groups = {door=1} local door_groups = {door=1, not_in_creative_inventory=1}
for k, v in pairs(groups) do for k, v in pairs(groups) do
if k ~= "wood" then if k ~= "wood" then
door_groups[k] = v door_groups[k] = v