Merge 3bd44e85a1 into 253af00743

mods/default/functions.lua

@@ -1,5 +1,7 @@
 -- mods/default/functions.lua
-
+if not minetest.get_modpath("locks") then
+minetest.register_privilege("diglocks",  { description = "allows to open/use and dig up all locked objects", give_to_singleplayer = false});
+end
 --
 -- Sounds
 --

mods/default/nodes.lua

@@ -714,10 +714,10 @@ minetest.register_node("default:chest", {
 })
 
 local function has_locked_chest_privilege(meta, player)
-	if player:get_player_name() ~= meta:get_string("owner") then
+	if (player:get_player_name() == meta:get_string("owner")) or (minetest.check_player_privs(player:get_player_name(), {diglocks=true})) then
-		return false
+		return true
 	end
-	return true
+	return false
 end
 
 minetest.register_node("default:chest_locked", {

mods/doors/init.lua

@@ -15,6 +15,7 @@ doors = {}
 --    selection_box_top
 --    only_placer_can_open: if true only the player who placed the door can
 --                          open it
+
 function doors:register_door(name, def)
 	def.groups.not_in_creative_inventory = 1
 
@@ -131,7 +132,7 @@ function doors:register_door(name, def)
 		end
 		local meta = minetest.get_meta(pos)
 		local pn = player:get_player_name()
-		return meta:get_string("doors_owner") == pn
+		return (meta:get_string("doors_owner") == pn) or (minetest.check_player_privs(player:get_player_name(), {diglocks=true}))
 	end
 
 	minetest.register_node(name.."_b_1", {