mirror of
https://github.com/luanti-org/minetest_game.git
synced 2025-04-30 13:11:41 -04:00
Beds: allow digging stray top nodes
This may occur by rotating the bottom bed node without calling the 'on_rotate' callback for various reasons.
This commit is contained in:
parent
9bcf2d46d0
commit
a4f936bdb6
1 changed files with 28 additions and 16 deletions
|
@ -6,23 +6,33 @@ local function remove_no_destruct(pos)
|
||||||
minetest.check_for_falling(pos)
|
minetest.check_for_falling(pos)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function destruct_bed(pos, n)
|
--- returns the position of the other bed half (or nil on failure)
|
||||||
local node = minetest.get_node(pos)
|
local function get_other_bed_pos(pos, n)
|
||||||
|
local node = core.get_node(pos)
|
||||||
|
local dir = core.facedir_to_dir(node.param2)
|
||||||
local other
|
local other
|
||||||
|
|
||||||
if n == 2 then
|
if n == 2 then
|
||||||
local dir = minetest.facedir_to_dir(node.param2)
|
|
||||||
other = vector.subtract(pos, dir)
|
other = vector.subtract(pos, dir)
|
||||||
elseif n == 1 then
|
elseif n == 1 then
|
||||||
local dir = minetest.facedir_to_dir(node.param2)
|
|
||||||
other = vector.add(pos, dir)
|
other = vector.add(pos, dir)
|
||||||
|
else
|
||||||
|
return nil
|
||||||
end
|
end
|
||||||
local oname = minetest.get_node(other).name
|
|
||||||
if minetest.get_item_group(oname, "bed") ~= 0 then
|
local onode = core.get_node(other)
|
||||||
|
if onode.param2 == node.param2 and core.get_item_group(onode.name, "bed") ~= 0 then
|
||||||
|
return other
|
||||||
|
end
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
|
local function destruct_bed(pos, n)
|
||||||
|
local other = get_other_bed_pos(pos, n)
|
||||||
|
if other then
|
||||||
remove_no_destruct(other)
|
remove_no_destruct(other)
|
||||||
beds.remove_spawns_at(pos)
|
|
||||||
beds.remove_spawns_at(other)
|
beds.remove_spawns_at(other)
|
||||||
end
|
end
|
||||||
|
beds.remove_spawns_at(pos)
|
||||||
end
|
end
|
||||||
|
|
||||||
function beds.register_bed(name, def)
|
function beds.register_bed(name, def)
|
||||||
|
@ -157,23 +167,25 @@ function beds.register_bed(name, def)
|
||||||
paramtype = "light",
|
paramtype = "light",
|
||||||
paramtype2 = "facedir",
|
paramtype2 = "facedir",
|
||||||
is_ground_content = false,
|
is_ground_content = false,
|
||||||
pointable = false,
|
|
||||||
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 2,
|
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 2,
|
||||||
not_in_creative_inventory = 1},
|
not_in_creative_inventory = 1},
|
||||||
sounds = def.sounds or default.node_sound_wood_defaults(),
|
sounds = def.sounds or default.node_sound_wood_defaults(),
|
||||||
drop = name .. "_bottom",
|
drop = "",
|
||||||
node_box = {
|
node_box = {
|
||||||
type = "fixed",
|
type = "fixed",
|
||||||
fixed = def.nodebox.top,
|
fixed = def.nodebox.top,
|
||||||
},
|
},
|
||||||
|
selection_box = {
|
||||||
|
type = "fixed",
|
||||||
|
-- Small selection box to allow digging stray top nodes
|
||||||
|
fixed = {-0.3, -0.3, -0.3, 0.3, -0.1, 0.3},
|
||||||
|
},
|
||||||
on_destruct = function(pos)
|
on_destruct = function(pos)
|
||||||
destruct_bed(pos, 2)
|
destruct_bed(pos, 2)
|
||||||
end,
|
end,
|
||||||
can_dig = function(pos, player)
|
can_dig = function(pos, player)
|
||||||
local node = minetest.get_node(pos)
|
local other = get_other_bed_pos(pos, 2)
|
||||||
local dir = minetest.facedir_to_dir(node.param2)
|
return (not other) or beds.can_dig(other)
|
||||||
local p = vector.add(pos, dir)
|
|
||||||
return beds.can_dig(p)
|
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue