From 008c1a466da85694b651480c0e6f873083a58c09 Mon Sep 17 00:00:00 2001
From: flux <25628292+fluxionary@users.noreply.github.com>
Date: Sat, 22 Aug 2020 18:06:58 +0000
Subject: [PATCH] check protection when attempting to dig multiblocks

---
 tubelib_addons1/fermenter.lua | 18 ++++++++++++++++--
 tubelib_addons1/reformer.lua  | 20 +++++++++++++++++---
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/tubelib_addons1/fermenter.lua b/tubelib_addons1/fermenter.lua
index a908ed8..0abb51f 100644
--- a/tubelib_addons1/fermenter.lua
+++ b/tubelib_addons1/fermenter.lua
@@ -199,12 +199,19 @@ minetest.register_node("tubelib_addons1:fermenter", {
 
 	-- the fermenter needs 'on_dig' to be able to remove the upper node
 	on_dig = function(pos, node, player)
+		local pos_above = vector.add(pos, vector.new(0, 1, 0))
+		local player_name = player:get_player_name()
+
+		if minetest.is_protected(pos, player_name) or minetest.is_protected(pos_above, player_name) then
+			return
+		end
+
 		local meta = M(pos)
 		local inv = meta:get_inventory()
 		if inv:is_empty("dst") and inv:is_empty("src") then
 			State:on_dig_node(pos, node, player)
 			tubelib.remove_node(pos)
-			minetest.remove_node({x=pos.x, y=pos.y+1, z=pos.z})
+			minetest.remove_node(pos_above)
 		end
 	end,
 
@@ -263,11 +270,18 @@ minetest.register_node("tubelib_addons1:fermenter_defect", {
 
 	-- the fermenter needs 'on_dig' to be able to remove the upper node
 	on_dig = function(pos, node, puncher, pointed_thing)
+		local pos_above = vector.add(pos, vector.new(0, 1, 0))
+		local puncher_name = puncher:get_player_name()
+
+		if minetest.is_protected(pos, puncher_name) or minetest.is_protected(pos_above, puncher_name) then
+			return
+		end
+
 		local meta = M(pos)
 		local inv = meta:get_inventory()
 		if inv:is_empty("dst") and inv:is_empty("src") then
 			minetest.node_dig(pos, node, puncher, pointed_thing)
-			minetest.remove_node({x=pos.x, y=pos.y+1, z=pos.z})
+			minetest.remove_node(pos_above)
 		end
 	end,
 
diff --git a/tubelib_addons1/reformer.lua b/tubelib_addons1/reformer.lua
index f490c62..4a88b61 100644
--- a/tubelib_addons1/reformer.lua
+++ b/tubelib_addons1/reformer.lua
@@ -194,13 +194,20 @@ minetest.register_node("tubelib_addons1:reformer", {
 	end,
 
 	-- the reformer needs 'on_dig' to be able to remove the upper node
-	on_dig = function(pos, node, puncher, pointed_thing)
+	on_dig = function(pos, node, puncher)
+		local pos_above = vector.add(pos, vector.new(0, 1, 0))
+		local player_name = puncher:get_player_name()
+
+		if minetest.is_protected(pos, player_name) or minetest.is_protected(pos_above, player_name) then
+			return
+		end
+
 		local meta = M(pos)
 		local inv = meta:get_inventory()
 		if inv:is_empty("dst") and inv:is_empty("src") then
 			State:on_dig_node(pos, node, puncher)
 			tubelib.remove_node(pos)
-			minetest.remove_node({x=pos.x, y=pos.y+1, z=pos.z})
+			minetest.remove_node(pos_above)
 		end
 	end,
 
@@ -259,11 +266,18 @@ minetest.register_node("tubelib_addons1:reformer_defect", {
 
 	-- the reformer needs 'on_dig' to be able to remove the upper node
 	on_dig = function(pos, node, puncher, pointed_thing)
+		local pos_above = vector.add(pos, vector.new(0, 1, 0))
+		local puncher_name = puncher:get_player_name()
+
+		if minetest.is_protected(pos, puncher_name) or minetest.is_protected(pos_above, puncher_name) then
+			return
+		end
+
 		local meta = M(pos)
 		local inv = meta:get_inventory()
 		if inv:is_empty("dst") and inv:is_empty("src") then
 			minetest.node_dig(pos, node, puncher, pointed_thing)
-			minetest.remove_node({x=pos.x, y=pos.y+1, z=pos.z})
+			minetest.remove_node(pos_above)
 		end
 	end,