#375 Better detect hopper touches

This commit is contained in:
kay27 2022-07-19 04:42:30 +03:00
parent 3d656522f2
commit e80f95710d
1 changed files with 7 additions and 4 deletions

View File

@ -357,6 +357,7 @@ minetest.register_abm({
local above_node_name = above_node.name local above_node_name = above_node.name
if minetest_registered_items[above_node_name] and minetest_get_item_group(above_node_name, "container") == 0 then if minetest_registered_items[above_node_name] and minetest_get_item_group(above_node_name, "container") == 0 then
-- Suck in dropped items -- Suck in dropped items
local y_top_touch_to_suck = y_above + 0.5
for _, object in pairs(minetest_get_objects_inside_radius(pos_above, 1)) do for _, object in pairs(minetest_get_objects_inside_radius(pos_above, 1)) do
if not object:is_player() then if not object:is_player() then
local entity = object:get_luaentity() local entity = object:get_luaentity()
@ -368,9 +369,11 @@ minetest.register_abm({
-- This is the reason for the Y calculation. -- This is the reason for the Y calculation.
-- Test: Items on farmland and slabs get sucked, but items on full blocks don't -- Test: Items on farmland and slabs get sucked, but items on full blocks don't
local object_pos = object:get_pos() local object_pos = object:get_pos()
local object_pos_miny = object_pos.y + object:get_properties().collisionbox[2] local object_pos_y = object_pos.y
if (math_abs(object_pos.x - x ) <= 0.5) local object_collisionbox = object:get_properties().collisionbox
and (math_abs(object_pos_miny - y_above) <= 0.5) local touches_from_above = object_pos_y + object_collisionbox[2] <= y_top_touch_to_suck
if touches_from_above
and (math_abs(object_pos.x - x) <= 0.5)
and (math_abs(object_pos.z - z) <= 0.5) and (math_abs(object_pos.z - z) <= 0.5)
then then
object:remove() object:remove()