Localize the hud table and tidy up the chat commands

Author: SmallJoker

init.lua

@@ -59,7 +59,7 @@ s_protect.command_show = function(name)
 	local player_pos = vector.round(player:getpos())
 	local data = s_protect.get_data(player_pos)
 
-	minetest.add_entity(s_protect.get_center(player_pos), "s_protect:marker")
+	minetest.add_entity(s_protect.get_center(player_pos), "simple_protection:marker")
 	local axis = s_protect.get_y_axis(player_pos.y)
 	local y_end = axis + s_protect.claim_height
 	minetest.chat_send_player(name, "Vertical area limit from Y "..axis.." to "..y_end)
@@ -180,23 +180,22 @@ s_protect.command_unshareall = function(name, param)
 		removed = true
 	end
 
-	--loops everywhere
+	-- Unshare each single claim
 	for pos, data in pairs(s_protect.claims) do
 		if data.owner == name then
 			if table_delete(data.shared, param) then
 				removed = true
 			end
 		end
 	end
-	s_protect.save()
 	if not removed then
-		minetest.chat_send_player(name, param.." did not have access to any of your areas.")
-		return
+		return false, param.." did not have access to any of your areas."
 	end
-	minetest.chat_send_player(name, param.." has no longer access to your areas.")
+	s_protect.save()
 	if minetest.get_player_by_name(param) then
 		minetest.chat_send_player(param, name.." unshared all areas with you.")
 	end
+	return true, param.." has no longer access to your areas."
 end
 
 s_protect.command_unclaim = function(name)
@@ -205,13 +204,11 @@ s_protect.command_unclaim = function(name)
 	local pos = s_protect.get_location(player_pos)
 	local data = s_protect.claims[pos]
 	if not data then
-		minetest.chat_send_player(name, "You do not own this area.")
-		return
+		return false, "You do not own this area."
 	end
-	local priv = minetest.check_player_privs(name, {simple_protection=true})
+	local privs = minetest.check_player_privs(name, {simple_protection=true})
 	if name ~= data.owner and not priv then
-		minetest.chat_send_player(name, "You do not own this area.")
-		return
+		return false, "You do not own this area."
 	end
 	if not priv and s_protect.claim_return then
 		local inv = player:get_inventory()
@@ -221,5 +218,5 @@ s_protect.command_unclaim = function(name)
 	end
 	s_protect.claims[pos] = nil
 	s_protect.save()
-	minetest.chat_send_player(name, "This area is unowned now.")
+	return true, "This area is unowned now."
 end

protection.lua

@@ -33,18 +33,19 @@ minetest.item_place = function(itemstack, placer, pointed_thing)
 	end
 end
 
-s_protect.hud_time = 0
+local hud_time = 0
 s_protect.player_huds = {}
 
 minetest.register_globalstep(function(dtime)
-	s_protect.hud_time = s_protect.hud_time + dtime
-	if s_protect.hud_time < 3 then
+	hud_time = hud_time + dtime
+	if hud_time < 3 then
 		return
 	end
-	s_protect.hud_time = 0
-	-- get players
+	hud_time = 0
+
+
 	local shared = s_protect.share
-	for _,player in ipairs(minetest.get_connected_players()) do
+	for _, player in ipairs(minetest.get_connected_players()) do
 		local pos = vector.round(player:getpos())
 		local player_name = player:get_player_name()
 
@@ -56,23 +57,24 @@ minetest.register_globalstep(function(dtime)
 
 		local has_access = (current_owner == player_name)
 		if not has_access and data then
+			-- Check if this area is shared with this player
 			has_access = table_contains(data.shared, player_name)
 		end
 		if not has_access then
+			-- Check if all areas are shared with this player
 			has_access = table_contains(shared[current_owner], player_name)
 		end
 		local changed = true
 
-		if s_protect.player_huds[player_name] then
-			if s_protect.player_huds[player_name].owner == current_owner and
-				s_protect.player_huds[player_name].had_access == has_access then
-				-- still the same hud
-				changed = false
-			end
+		local hud_table = s_protect.player_huds[player_name]
+		if hud_table and hud_table.owner == current_owner
+				and hud_table.had_access == has_access then
+			-- still the same hud
+			changed = false
 		end
 
-		if s_protect.player_huds[player_name] and changed then
-			player:hud_remove(s_protect.player_huds[player_name].hudID)
+		if hud_table and changed then
+			player:hud_remove(hud_table.hudID)
 			s_protect.player_huds[player_name] = nil
 		end
 

settings.conf

@@ -4,7 +4,7 @@
 -- Size of claims in nodes, must be an even number <[16]>
 s_protect.claim_size = 16
 
--- High of claims in nodes <[80]>
+-- Height of claims in nodes <[80]>
 s_protect.claim_height = 80
 
 -- Nodes to start in underground, 80 - 20 = 60 nodes above ground <[20]>