Painting: Use on_place for random placing

diff --git a/mailbox.lua b/mailbox.lua
index dc02521df01c470c10fb51ad446235053699577a..041133364ae6435d82a8e6430fa84e158bec96d5 100644 (file)
--- a/mailbox.lua
+++ b/mailbox.lua
@@ -94,7 +94,7 @@ function mailbox.put(pos, listname, _, stack, player)
                if inv:room_for_item("mailbox", stack) then
                        return -1
                else
-                       minetest.chat_send_player(player:get_player_name(), "[!] The mailbox is full")
+                       minetest.chat_send_player(player:get_player_name(), "The mailbox is full")
                end
        end
        return 0

diff --git a/nodes.lua b/nodes.lua
index fdd6fdb6128b6aa1cb4f6ba5e0e0524a513c9cef..83f44d6b3b0232e07c7ae90e44069b3a4dcf737a 100644 (file)
--- a/nodes.lua
+++ b/nodes.lua
@@ -54,7 +54,7 @@ xdecor.register("baricade", {
        groups = {choppy=2, oddly_breakable_by_hand=1, flammable=2},
        damage_per_second = 4,
        selection_box = xdecor.nodebox.slab_y(0.3),
-       collision_box = xdecor.pixelbox(2, {{0,0,1,2,2,0}})
+       collision_box = xdecor.pixelbox(2, {{0, 0, 1, 2, 2, 0}})
 })
 
 xdecor.register("barrel", {
@@ -359,11 +359,22 @@ xdecor.register("painting_1", {
        groups = {choppy=3, oddly_breakable_by_hand=2, flammable=2, attached_node=1},
        sounds = default.node_sound_wood_defaults(),
        node_box = painting_box,
-       on_construct = function(pos)
-               local node = minetest.get_node(pos)
-               local random = math.random(4)
-               if random == 1 then return end
-               minetest.set_node(pos, {name="xdecor:painting_"..random, param2=node.param2})
+       node_placement_prediction = "",
+       on_place = function(itemstack, placer, pointed_thing)
+               local player_name = placer:get_player_name()
+               local pos = pointed_thing.above
+
+               if not minetest.is_protected(pos, player_name) then
+                       local num = math.random(4)
+                       local dir = minetest.dir_to_wallmounted(placer:get_look_dir())
+                       minetest.set_node(pos, {name="xdecor:painting_"..num, param2=dir})
+               else
+                       minetest.chat_send_player(player_name, "This area is protected")
+               end
+               if not minetest.setting_getbool("creative_mode") then
+                       itemstack:take_item()
+                       return itemstack
+               end
        end
 })