Armor stand, check protection and ignore, ignore

This commit is contained in:
stujones11 2017-02-08 20:57:42 +00:00
parent 8939a0dd43
commit ba62febdee

@ -98,10 +98,11 @@ local function has_locked_armor_stand_privilege(meta, player)
return true return true
end end
local function add_hidden_node(pos) local function add_hidden_node(pos, player)
local p = {x=pos.x, y=pos.y + 1, z=pos.z} local p = {x=pos.x, y=pos.y + 1, z=pos.z}
local name = player:get_player_name()
local node = minetest.get_node(p) local node = minetest.get_node(p)
if node.name == "air" or node.name == "ignore" then if node.name == "air" and not minetest.is_protected(pos, name) then
minetest.set_node(p, {name="3d_armor_stand:top"}) minetest.set_node(p, {name="3d_armor_stand:top"})
end end
end end
@ -162,9 +163,9 @@ minetest.register_node("3d_armor_stand:armor_stand", {
end end
return true return true
end, end,
after_place_node = function(pos) after_place_node = function(pos, placer)
minetest.add_entity(pos, "3d_armor_stand:armor_entity") minetest.add_entity(pos, "3d_armor_stand:armor_entity")
add_hidden_node(pos) add_hidden_node(pos, placer)
end, end,
allow_metadata_inventory_put = function(pos, listname, index, stack) allow_metadata_inventory_put = function(pos, listname, index, stack)
local def = stack:get_definition() or {} local def = stack:get_definition() or {}
@ -238,7 +239,7 @@ minetest.register_node("3d_armor_stand:locked_armor_stand", {
meta:set_string("owner", placer:get_player_name() or "") meta:set_string("owner", placer:get_player_name() or "")
meta:set_string("infotext", "Armor Stand (owned by " .. meta:set_string("infotext", "Armor Stand (owned by " ..
meta:get_string("owner") .. ")") meta:get_string("owner") .. ")")
add_hidden_node(pos) add_hidden_node(pos, placer)
end, end,
allow_metadata_inventory_put = function(pos, listname, index, stack, player) allow_metadata_inventory_put = function(pos, listname, index, stack, player)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)