Protection support

Author: sfan5

mods/default/furnace.lua

@@ -129,7 +129,15 @@ minetest.override_item("default:furnace", {
 	can_dig = function(pos, player)
 		local meta = minetest.get_meta(pos)
 		local inv = meta:get_inventory()
-		return inv:is_empty("fuel") and inv:is_empty("src") and inv:is_empty("dest")
+		if inv:is_empty("fuel") and inv:is_empty("src") and inv:is_empty("dest") then
+			local player_name = player:get_player_name()
+			if minetest.is_protected(pos, player_name) then
+				minetest.record_protection_violation(pos, player_name)
+				return false
+			end
+			return true
+		end
+		return false
 	end,
 
 	on_timer = function(pos, elapsed)
@@ -149,6 +157,31 @@ minetest.override_item("default:furnace", {
 		return true
 	end,
 
+	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
+		local player_name = player:get_player_name()
+		if minetest.is_protected(pos, player_name) then
+			minetest.record_protection_violation(pos, player_name)
+			return 0
+		end
+		return count
+	end,
+	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
+		local player_name = player:get_player_name()
+		if minetest.is_protected(pos, player_name) then
+			minetest.record_protection_violation(pos, player_name)
+			return 0
+		end
+		return stack:get_count()
+	end,
+	allow_metadata_inventory_take = function(pos, listname, index, stack, player)
+		local player_name = player:get_player_name()
+		if minetest.is_protected(pos, player_name) then
+			minetest.record_protection_violation(pos, player_name)
+			return 0
+		end
+		return stack:get_count()
+	end,
+
 	--on_punch = function(pos, node)
 	--	local meta = minetest.get_meta(pos)
 	--	print(dump(meta:to_table()))

mods/default/init.lua

@@ -38,11 +38,11 @@ default.get_translator = S
 -- sound ideas: furnace, eating
 -- falling sand/gravel
 -- investigate long vertical shafts (mgv6 fail?)
+-- some particle effects
 
 -- long-term TODOs?:
 -- consider adding unfinished features like firefly spawn & standing signs
 -- texture animations for some
--- protection support
 -- 3d model signs and torches
 -- maybe 3d model mobs
 
@@ -895,6 +895,10 @@ minetest.register_node("default:sign_wall", {
 	end,
 	on_receive_fields = function(pos, formname, fields, sender)
 		local player_name = sender:get_player_name()
+		if minetest.is_protected(pos, player_name) then
+			minetest.record_protection_violation(pos, player_name)
+			return
+		end
 		local meta = minetest.get_meta(pos)
 		local text = fields.text
 		if not text then
@@ -911,6 +915,20 @@ minetest.register_node("default:sign_wall", {
 	end,
 })
 
+local function can_dig_chest(pos, player)
+	local meta = minetest.get_meta(pos)
+	local inv = meta:get_inventory()
+	if not inv:is_empty("main") then
+		return false
+	end
+	local player_name = player:get_player_name()
+	if minetest.is_protected(pos, player_name) then
+		minetest.record_protection_violation(pos, player_name)
+		return false
+	end
+	return true
+end
+
 minetest.register_node("default:chest", {
 	description = S("Chest"),
 	tiles = { "chest_top.png", "chest_top.png", "chest_side.png", "chest_side.png", "chest_side.png", "chest_front.png" },
@@ -929,22 +947,22 @@ minetest.register_node("default:chest", {
 		local inv = meta:get_inventory()
 		inv:set_size("main", 8*4)
 	end,
-	can_dig = function(pos, player)
-		local meta = minetest.get_meta(pos)
-		local inv = meta:get_inventory()
-		return inv:is_empty("main")
-	end,
+	can_dig = can_dig_chest,
 })
 
 local function can_use_locked_chest(meta, player)
-	if meta:get_string("owner") == player:get_player_name() then
-		return true
+	local player_name = player:get_player_name()
+	if meta:get_string("owner") ~= player_name then
+		-- 0.3 uses the 'server' priv for this
+		if not minetest.check_player_privs(player, "protection_bypass") then
+			return false
+		end
 	end
-	-- 0.3 uses the 'server' priv for this
-	if minetest.check_player_privs(player, "protection_bypass") then
-		return true
+	if minetest.is_protected(pos, player_name) then
+		minetest.record_protection_violation(pos, player_name)
+		return false
 	end
-	return false
+	return true
 end
 
 minetest.register_node("default:chest_locked", {
@@ -970,11 +988,8 @@ minetest.register_node("default:chest_locked", {
 		local inv = meta:get_inventory()
 		inv:set_size("main", 8*4)
 	end,
-	can_dig = function(pos, player)
-		local meta = minetest.get_meta(pos)
-		local inv = meta:get_inventory()
-		return inv:is_empty("main")
-	end,
+	-- note: can_dig_chest() does not check the owner, this is intentional.
+	can_dig = can_dig_chest,
 	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
 		local meta = minetest.get_meta(pos)
 		if not can_use_locked_chest(meta, player) then

mods/default/sao.lua

@@ -54,12 +54,15 @@ local function checkFreeAndWalkablePosition(p0, size)
 end
 
 local function explodeSquare(p0, size)
-	-- FIXME: callbacks / indestructability?
+	-- FIXME: implement on_blast & item drops
 	local positions = {}
 	for dx = 0, size.x - 1 do
 	for dy = 0, size.y - 1 do
 	for dz = 0, size.z - 1 do
-		positions[#positions+1] = vector.offset(p0, dx, dy, dz)
+		local p = vector.offset(p0, dx, dy, dz)
+		if not minetest.is_protected(p, "") then
+			positions[#positions+1] = p
+		end
 	end
 	end
 	end