Beds: Re-add commas at list ends

[oweals/minetest_game.git] / mods / beds / api.lua

diff --git a/mods/beds/api.lua b/mods/beds/api.lua
index 320fcfb35dbaa6d4f4100414f7c51b82531edafc..6b72814df12a9b510ca19d4f6bd5dadc76176c66 100644 (file)
--- a/mods/beds/api.lua
+++ b/mods/beds/api.lua
@@ -7,6 +7,7 @@ function beds.register_bed(name, def)
                tiles = def.tiles.bottom,
                paramtype = "light",
                paramtype2 = "facedir",
+               is_ground_content = false,
                stack_max = 1,
                groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 1},
                sounds = default.node_sound_wood_defaults(),
@@ -17,7 +18,6 @@ function beds.register_bed(name, def)
                selection_box = {
                        type = "fixed",
                        fixed = def.selectionbox,
-                               
                },
                after_place_node = function(pos, placer, itemstack)
                        local n = minetest.get_node_or_nil(pos)
@@ -26,10 +26,10 @@ function beds.register_bed(name, def)
                                return true
                        end
                        local dir = minetest.facedir_to_dir(n.param2)
-                       local p = {x=pos.x+dir.x,y=pos.y,z=pos.z+dir.z}
+                       local p = vector.add(pos, dir)
                        local n2 = minetest.get_node_or_nil(p)
-                       local def = minetest.registered_items[n2.name] or nil
-                       if not n2 or not def or not def.buildable_to then
+                       local def = n2 and minetest.registered_items[n2.name]
+                       if not def or not def.buildable_to then
                                minetest.remove_node(pos)
                                return true
                        end
@@ -40,7 +40,7 @@ function beds.register_bed(name, def)
                        local n = minetest.get_node_or_nil(pos)
                        if not n then return end
                        local dir = minetest.facedir_to_dir(n.param2)
-                       local p = {x=pos.x+dir.x,y=pos.y,z=pos.z+dir.z}
+                       local p = vector.add(pos, dir)
                        local n2 = minetest.get_node(p)
                        if minetest.get_item_group(n2.name, "bed") == 2 and n.param2 == n2.param2 then
                                minetest.remove_node(p)
@@ -49,6 +49,37 @@ function beds.register_bed(name, def)
                on_rightclick = function(pos, node, clicker)
                        beds.on_rightclick(pos, clicker)
                end,
+               on_rotate = function(pos, node, user, mode, new_param2)
+                       local dir = minetest.facedir_to_dir(node.param2)
+                       local p = vector.add(pos, dir)
+                       local node2 = minetest.get_node_or_nil(p)
+                       if not node2 or not minetest.get_item_group(node2.name, "bed") == 2 or
+                                       not node.param2 == node2.param2 then
+                               return false
+                       end
+                       if minetest.is_protected(p, user:get_player_name()) then
+                               minetest.record_protection_violation(p, user:get_player_name())
+                               return false
+                       end
+                       if mode ~= screwdriver.ROTATE_FACE then
+                               return false
+                       end
+                       local newp = vector.add(pos, minetest.facedir_to_dir(new_param2))
+                       local node3 = minetest.get_node_or_nil(newp)
+                       local def = node3 and minetest.registered_nodes[node3.name]
+                       if not def or not def.buildable_to then
+                               return false
+                       end
+                       if minetest.is_protected(newp, user:get_player_name()) then
+                               minetest.record_protection_violation(newp, user:get_player_name())
+                               return false
+                       end
+                       node.param2 = new_param2
+                       minetest.swap_node(pos, node)
+                       minetest.remove_node(p)
+                       minetest.set_node(newp, {name = node.name:gsub("%_bottom", "_top"), param2 = new_param2})
+                       return true
+               end,
        })
 
        minetest.register_node(name .. "_top", {
@@ -56,16 +87,14 @@ function beds.register_bed(name, def)
                tiles = def.tiles.top,
                paramtype = "light",
                paramtype2 = "facedir",
+               is_ground_content = false,
+               pointable = false,
                groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 2},
                sounds = default.node_sound_wood_defaults(),
                node_box = {
                        type = "fixed",
                        fixed = def.nodebox.top,
                },
-               selection_box = {
-                       type = "fixed",
-                       fixed = {0, 0, 0, 0, 0, 0},
-               },
        })
 
        minetest.register_alias(name, name .. "_bottom")