From 80ca2634c0bd07f74f43dd5d11892442882d03d7 Mon Sep 17 00:00:00 2001
From: y <y@y>
Date: Wed, 17 Jul 2019 23:40:59 +0000
Subject: [PATCH] fix dirt dupe on pitchfork use

---
 nodes_hay.lua | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/nodes_hay.lua b/nodes_hay.lua
index 3d1f8b0..93c093b 100644
--- a/nodes_hay.lua
+++ b/nodes_hay.lua
@@ -8,33 +8,41 @@ local S = cottages.S
 -- The hay will disappear (decay) after a couple of minutes.
 if(     minetest.registered_items["default:dirt_with_grass"]
     and minetest.registered_tools["cottages:pitchfork"]) then
+	local old_on_dig = minetest.registered_items["default:dirt_with_grass"].on_dig
+
+	local function is_protected(pos, name)
+			return minetest.is_protected(pos, name) and
+					not minetest.check_player_privs(name, "protection_bypass")
+	end
+
   minetest.override_item("default:dirt_with_grass", {
-	after_dig_node = function(pos, oldnode, oldmetadata, digger)
+	  on_dig = function(pos, node, digger)
+		  local diggername = digger:get_player_name()
 		if( not( pos ) or not( digger )) then
-			return
+			return old_on_dig(pos, node, digger)
 		end
 		local wielded = digger:get_wielded_item()
 		if(    not( wielded )
 		    or not( wielded:get_name() )
 		    or (wielded:get_name()~="cottages:pitchfork")) then
-			return
+			return old_on_dig(pos, node, digger)
 		end
-
 		local pos_above = {x=pos.x, y=pos.y+1, z=pos.z}
 		local node_above = minetest.get_node_or_nil( pos_above)
 		if( not(node_above) or not(node_above.name) or node_above.name ~= "air" ) then
-			return nil
+			return old_on_dig(pos, node, digger)
+		end
+		if is_protected(pos, diggername) or is_protected(pos_above, diggername) then
+			return old_on_dig(pos, node, digger)
 		end
 		minetest.swap_node( pos,       {name="default:dirt"})
-		minetest.add_node(  pos_above, {name="cottages:hay_mat", param2=math.random(2,25)}) 
+		minetest.add_node(  pos_above, {name="cottages:hay_mat", param2=math.random(2,25)})
 		-- start a node timer so that the hay will decay after some time
 		local timer = minetest.get_node_timer(pos_above)
 		if not timer:is_started() then
 			timer:start(math.random(60, 300))
 		end
-		-- TODO: prevent dirt from beeing multiplied this way (that is: give no dirt!)
-		return
-	end,
+	  end,
   })
 end