Tweaked code to work better for violation drops

3 files changed, 22 insertions, 21 deletions

diff --git a/admin.lua b/admin.lua
index 063d5ed..e48c0e4 100644
--- a/admin.lua
+++ b/admin.lua
@@ -47,7 +47,7 @@ minetest.register_abm({
 
 		local names = protector.removal_names:split(" ")
 
-		for _, n in ipairs(names) do
+		for _, n in pairs(names) do
 
 			if n == owner then
 				minetest.set_node(pos, {name = "air"})
diff --git a/doors_chest.lua b/doors_chest.lua
index 6e1ead9..7b8a464 100644
--- a/doors_chest.lua
+++ b/doors_chest.lua
@@ -290,7 +290,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		if fields.toup then
 
 			-- copy contents of players inventory to chest
-			for i, v in ipairs (player_inv:get_list("main") or {}) do
+			for i, v in pairs (player_inv:get_list("main") or {}) do
 
 				if chest_inv
 				and chest_inv:room_for_item('main', v) then
@@ -309,7 +309,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		elseif fields.todn then
 
 			-- copy contents of chest to players inventory
-			for i, v in ipairs (chest_inv:get_list('main') or {}) do
+			for i, v in pairs (chest_inv:get_list('main') or {}) do
 
 				if player_inv:room_for_item("main", v) then
 
diff --git a/init.lua b/init.lua
index 8a4f46f..ce3cec8 100644
--- a/init.lua
+++ b/init.lua
@@ -45,7 +45,7 @@ protector.del_member = function(meta, name)
 
 	local list = protector.get_member_list(meta)
 
-	for i, n in ipairs(list) do
+	for i, n in pairs(list) do
 
 		if n == name then
 			table.remove(list, i)
@@ -71,7 +71,7 @@ protector.generate_formspec = function(meta)
 	local npp = 12 -- max users added onto protector list
 	local i = 0
 
-	for _, member in ipairs(members) do
+	for _, member in pairs(members) do
 
 		if i < npp then
 
@@ -136,7 +136,7 @@ protector.can_dig = function(r, pos, digger, onlyowner, infolevel)
 
 	local meta, owner, members
 
-	for _, pos in ipairs(positions) do
+	for _, pos in pairs(positions) do
 
 		meta = minetest.get_meta(pos)
 		owner = meta:get_string("owner")
@@ -214,29 +214,30 @@ function minetest.is_protected(pos, digger)
 
 		local player = minetest.get_player_by_name(digger)
 
+		-- hurt player if protection violated
 		if protector.hurt > 0
 		and player then
 			player:set_hp(player:get_hp() - protector.hurt)
 		end
 
+		-- drop tool/item if protection violated
 		if protector.drop == true
 		and player then
-			-- drop tool/item if protection violated
-			local tool = player:get_wielded_item()
-			--local wear = tool:get_wear()
-			local num = player:get_wield_index()
-			local player_inv = player:get_inventory()
-			local inv = player_inv:get_stack("main", num)
-			local sta = inv:take_item(inv:get_count())
-			local obj = minetest.add_item(player:getpos(), sta)
-
-			if obj then
-				obj:setvelocity({x = 0, y = 5, z = 0})
-				player:set_wielded_item(nil)
-				minetest.after(0.2, function()
-					player_inv:set_stack("main", num, nil)
-				end)
+
+			local holding = player:get_wielded_item()
+
+			if holding:to_string() ~= "" then
+
+				local sta = holding:take_item(holding:get_count())
+				local obj = minetest.add_item(player:getpos(), sta)
+
+				if obj then
+					obj:setvelocity({x = 0, y = 5, z = 0})
+					player:set_wielded_item(holding)
+				end
+
 			end
+
 		end
 
 		return true