forked from MineClone5/MineClone5
Set _removed to true in item entities sucked by hoppers
This double-check might just prevent future commits from triggering regressions allowing hoppers to duplicate items.
This commit is contained in:
parent
eee07f56b5
commit
0c6da14e1f
|
@ -350,7 +350,8 @@ minetest.register_abm({
|
|||
local inv = meta:get_inventory()
|
||||
|
||||
for _,object in pairs(minetest.get_objects_inside_radius(pos, 2)) do
|
||||
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" and not object:get_luaentity()._removed then
|
||||
local entity = object:get_luaentity()
|
||||
if not object:is_player() and entity and entity.name == "__builtin:item" and not entity._removed then
|
||||
if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
|
||||
-- Item must get sucked in when the item just TOUCHES the block above the hopper
|
||||
-- This is the reason for the Y calculation.
|
||||
|
@ -359,7 +360,8 @@ minetest.register_abm({
|
|||
local posob_miny = posob.y + object:get_properties().collisionbox[2]
|
||||
if math.abs(posob.x-pos.x) <= 0.5 and (posob_miny-pos.y < 1.5 and posob.y-pos.y >= 0.3) then
|
||||
inv:add_item("main", ItemStack(object:get_luaentity().itemstring))
|
||||
object:get_luaentity().itemstring = ""
|
||||
entity._removed = true
|
||||
entity.itemstring = ""
|
||||
object:remove()
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue