X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=rope.lua;h=1627fd8133982522421a36460bb1f758b00b645c;hb=7f274e0fdec1c2425456c97f677a46125fea129e;hp=3ef95ab6e414f9128d330bfe3d394ecf561aadd1;hpb=fda9237654e4aa0c167799c44793b00f46293727;p=xdecor.git

diff --git a/rope.lua b/rope.lua
index 3ef95ab..1627fd8 100644
--- a/rope.lua
+++ b/rope.lua
@@ -1,20 +1,14 @@
 local rope = {}
 
 -- Code by Mirko K. (modified by Temperest, Wulfsdad and kilbith) (License: GPL).
-minetest.register_on_punchnode(function(pos, oldnode, digger)
-	if oldnode.name == "xdecor:rope" then
-		rope:remove(pos, oldnode, digger, "xdecor:rope")
-	end
-end)
-
 function rope.place(itemstack, placer, pointed_thing)
 	if pointed_thing.type == "node" then
-		local under = pointed_thing.under
-		local above = pointed_thing.above
-		local pos = above
+		local pos = pointed_thing.above
 		local oldnode = minetest.get_node(pos)
 		local stackname = itemstack:get_name()
-		if minetest.is_protected(pos, placer:get_player_name()) then return end
+		if minetest.is_protected(pos, placer:get_player_name()) then
+			return itemstack
+		end
 
 		while oldnode.name == "air" and not itemstack:is_empty() do
 			local newnode = {name = stackname, param1 = 0}
@@ -27,7 +21,7 @@ function rope.place(itemstack, placer, pointed_thing)
 	return itemstack
 end
 
-function rope:remove(pos, oldnode, digger, rope_name)
+function rope.remove(pos, oldnode, digger, rope_name)
 	local num = 0
 	local below = {x=pos.x, y=pos.y, z=pos.z}
 	local digger_inv = digger:get_inventory()
@@ -47,10 +41,17 @@ xdecor.register("rope", {
 	drawtype = "plantlike",
 	walkable = false,
 	climbable = true,
-	groups = {dig_immediate=3, flammable=3},
+	groups = {snappy=3, flammable=3},
 	tiles = {"xdecor_rope.png"},
 	inventory_image = "xdecor_rope_inv.png",
 	wield_image = "xdecor_rope_inv.png",
 	selection_box = xdecor.pixelbox(8, {{3, 0, 3, 2, 8, 2}}),
-	on_place = rope.place
+	on_place = rope.place,
+	on_punch = function(pos, node, puncher, pointed_thing)
+		local player_name = puncher:get_player_name()
+		if not minetest.is_protected(pos, player_name) or
+			minetest.get_player_privs(player_name).protection_bypass then
+			rope.remove(pos, node, puncher, "xdecor:rope")
+		end
+	end
 })