Restore upstream default config

No guarantee is made auth_table contains auth entries or even exists.
Using this table directly is incompatible with auth handlers that don't
cache auth entries (e.g. when they are stored in an SQL database
supposed to be concurrently accessed and modified).

.luacheckrc

@@ -1,19 +0,0 @@
-unused_args = false
-allow_defined_top = true
-
-read_globals = {
-	"DIR_DELIM",
-	"core",
-	"dump",
-	"vector", "nodeupdate",
-	"VoxelManip", "VoxelArea",
-	"PseudoRandom", "ItemStack",
-	"AreaStore",
-	"intllib",
-	"default",
-	table = { fields = { "copy", "getn" } }
-}
-
-globals = {
-	"minetest"
-}

README.md

@@ -1,29 +1,21 @@
-Areas mod for Minetest
+Areas mod for Minetest 0.4.8+
-======================
+=============================
-
-Dependencies
-------------
-
-Minetest 5.0.0+ is recommended, but 0.4.16+ should work as well.
 
 
 Configuration
 -------------
 
-Open the tab `Settings -> All Settings -> Mods -> areas` to get a list of all
+If you wish to specify configuration options, such as whether players are
-possible settings.
+allowed to protect their own areas with the `protect` command (disabled by
-
+default), you should check config.lua and set the appropriate settings in your
-For server owners: Check `settingtypes.txt` and modify your `minetest.conf`
+server's configuration file (probably `minetest.conf`).
-according to the wanted setting changes.
-
 
 
 Tutorial
 --------
 
-1) Specify the corner positions of the area you would like to protect.
+To protect an area you must first set the corner positions of the area.
-Use one of the following commands:
+In order to set the corner positions you can run:
-
   * `/area_pos set` and punch the two corner nodes to set them.
   * `/area_pos set1/set2` and punch only the first or second corner node to
 	set them one at a time.
@@ -31,25 +23,25 @@ Use one of the following commands:
   * `/area_pos1/2 X Y Z` to set one of the positions to the specified
 	coordinates.
 
-2) Protect the selected area by running one of the following commands:
+Once you have set the border positions you can protect the area by running one
-
+of the following commands:
   * `/set_owner <OwnerName> <AreaName>` -- If you have the `areas` privilege.
   * `/protect <AreaName>` -- If you have the `areas` privilege or the server
 	administrator has enabled area self-protection.
 
-The area name is used only for informational purposes and has no functional
+The area name is used only for informational purposes (so that you know what
-importance.
+an area is for).  It is not used for any other purpose.
-
 For example: `/set_owner SomePlayer Mese city`
 
-3) You now own an area. You may now add sub-owners to it if you want to (see command `/add_owner`). Before using the `/add_owner` command you have to
+Now that you own an area you may want to add sub-owners to it. You can do this
-select the corners of the sub-area as you did in step 1.
+with the `add_owner` command.  Anyone with an area can use the `add_owner`
-
+command on their areas.  Before using the `add_owner` command you have to
-If your markers are still around your original area and you want to grant
+select the corners of the sub-area as you did for `set_owner`. If your markers
-access to your entire area you will not have to re-set them. Use `/select_area` to place the markers at the corners of an existing area if you've reset your
+are still around your original area and you want to grant access to your
+entire area you will not have to re-set them. You can also use `select_area` to
+place the markers at the corners of an existing area if you've reset your
 markers and want to grant access to a full area.
-
+The `add_owner` command expects three arguments:
-The `/add_owner` command expects three arguments:
   1. The ID number of the parent area (the area that you want to add a
 	sub-area to).
   2. The name of the player that will own the sub-area.

api.lua

@@ -1,50 +1,14 @@
-local hudHandlers = {}
 
----plants to place in openfarming
+--plants to place in openfarming
-local plants = {
+local plants = { ["farming:blueberries"]="air", ["farming:carrot"]="air", ["farming:coffee_beans"]="air", ["farming:corn"]="air", ["farming:cucumber"]="air",
-	["farming:blueberries"]="air", ["farming:carrot"]="air", ["farming:coffee_beans"]="air",
+				 ["farming:melon_slice"]="air", ["farming:potato"]="air", ["farming:pumpkin_slice"]="air", ["farming:raspberries"]="air", ["farming:rhubarb"]="air",
-	["farming:corn"]="air", ["farming:cucumber"]="air", ["farming:melon_slice"]="air",
+				 ["farming:tomato"]="air", ["farming:seed_cotton"]="air", ["farming:seed_wheat"]="air",["default:papyrus"]="air", ["farming:trellis"]="air",
-	["farming:potato"]="air", ["farming:pumpkin_slice"]="air", ["farming:raspberries"]="air",
+				 ["farming:grapes"]="farming:trellis", ["farming:beanpole"]="air", ["farming:beans"]="farming:beanpole",
-	["farming:rhubarb"]="air",	["farming:tomato"]="air", ["farming:seed_cotton"]="air",
+				}
-	["farming:seed_wheat"]="air",["default:papyrus"]="air", ["farming:trellis"]="air",
-	["farming:grapes"]="farming:trellis", ["farming:beanpole"]="air", ["farming:beans"]="farming:beanpole",
-}
-
-areas.registered_on_adds = {}
-areas.registered_on_removes = {}
-areas.registered_on_moves = {}
-
-function areas:registerOnAdd(func)
-	table.insert(areas.registered_on_adds, func)
-end
-
-function areas:registerOnRemove(func)
-	table.insert(areas.registered_on_removes, func)
-end
-
-function areas:registerOnMove(func)
-	table.insert(areas.registered_on_moves, func)
-end
-
-
---- Adds a function as a HUD handler, it will be able to add items to the Areas HUD element.
-function areas:registerHudHandler(handler)
-	table.insert(hudHandlers, handler)
-end
-
-
-function areas:getExternalHudEntries(pos)
-	local areas = {}
-	for _, func in pairs(hudHandlers) do
-		func(pos, areas)
-	end
-	return areas
-end
 
 --- Returns a list of areas that include the provided position.
 function areas:getAreasAtPos(pos)
 	local res = {}
-
 	if self.store then
 		local a = self.store:get_areas_for_pos(pos, false, true)
 		for store_id, store_area in pairs(a) do
@@ -100,6 +64,7 @@ function areas:canInteract(pos, name)
 		return true
 	end
 	local owned = false
+		if pos == nil  then return not owned end -- pour éviter crash avec nénuphar
 	for _, area in pairs(self:getAreasAtPos(pos)) do
 		if area.owner == name or area.open then
 			return true
@@ -121,13 +86,11 @@ function areas:canInteract(pos, name)
 			if plants[wstack] ~= nil and plants[wstack] == node then
 				return true
 			end
-		elseif areas.factions_available and area.faction_open then
+
-			local faction_name = factions.get_player_faction(area.owner)
+			owned = true
-			if faction_name ~= nil and faction_name == factions.get_player_faction(name) then
+		else
-				return true
+			owned = true
-			end
 		end
-		owned = true
 	end
 	return not owned
 end
@@ -190,3 +153,74 @@ function areas:canInteractInArea(pos1, pos2, name, allow_open)
 	-- intersecting areas and they are all owned by the player.
 	return true
 end
+
+
+
+function areas:canMakeArea(pos1, pos2, name) --MFF crabman(25/02/2016) fix areas in areas
+	if name and minetest.check_player_privs(name, self.adminPrivs) then
+		return true
+	end
+	areas:sortPos(pos1, pos2)
+
+	local id_areas_intersect = {}
+	local areas = self:getAreasIntersectingArea(pos1, pos2)
+
+	if not areas then return true end
+
+	for id, area in pairs(areas) do
+		if area.owner == name and self:isSubarea(pos1, pos2, id) then
+			return true
+		end
+		if not area.open and not self:isAreaOwner(id, name) then
+			table.insert(id_areas_intersect, id)
+		end
+	end
+
+	if #id_areas_intersect > 0 then
+		return false, id_areas_intersect[1]
+	end
+
+	return true
+end
+
+
+--MFF crabman(5/03/2016 ) return special area pos if a spawn is set.
+--1 party (2 party in beds mod)
+function areas:getSpawn(pos)
+	for _, area in pairs(areas:getAreasAtPos(pos)) do
+		if area.spawn and area.spawn.x then
+			return area.spawn
+		end
+	end
+	return nil
+end
+
+--MFF DEBUT crabman(17/09/2015 ) respawn player in special area(event) if a spawn is set.
+--1 party (2 party in beds mod)
+local dead_players = {}
+minetest.register_on_dieplayer(function(player)
+	local player_name = player:get_player_name()
+	if not player_name then return end
+	local pos = player:getpos()
+	if pos then
+		dead_players[player_name] = pos
+	end
+end)
+
+
+function areas:onRespawn(player)
+	local player_name = player:get_player_name()
+	if not player_name or not dead_players[player_name] then return false end
+	local pos = dead_players[player_name]
+	dead_players[player_name] = nil
+	if pos then
+		for _, area in pairs(areas:getAreasAtPos(pos)) do
+			if area.spawn then
+				player:setpos(area.spawn)
+				return true
+			end
+		end
+	end
+	return false
+end
+--FIN

api.md

@@ -1,48 +0,0 @@
-Areas mod API
-===
-
-API list
----
-
- * `areas:registerHudHandler(handler)` - Registers a handler to add items to the Areas HUD.  See [HUD](#hud).
- * `areas:registerOnAdd(func(id, area))`
- * `areas:registerOnRemove(func(id))`
- * `areas:registerOnMove(func(id, area, pos1, pos2))`
-
-
-HUD
----
-
-If you are making a protection mod or a similar mod that adds invisible regions
-to the world, and you would like then to show up in the areas HUD element, you
-can register a callback to show your areas.
-
-HUD handler specification:
-
- * `handler(pos, list)`
-   * `pos` - The position to check.
-   * `list` - The list of area HUD elements, this should be modified in-place.
-
-The area list item is a table containing a list of tables with the following fields:
-
- * `id` - An identifier for the area. This should be a unique string in the format `mod:id`.
- * `name` - The name of the area.
- * `owner` - The player name of the region owner, if any.
-
-All of the fields are optional but at least one of them must be set.
-
-### Example
-
-	local function areas_hud_handler(pos, areas)
-		local val = find_my_protection(pos)
-
-		if val then
-			table.insert(areas, {
-				id = "mod:"..val.id,
-				name = val.name,
-				owner = val.owner,
-			})
-		end
-	end
-
-	areas:registerHudHandler(areas_hud_handler)

chatcommands.lua

@@ -286,50 +286,26 @@ minetest.register_chatcommand("area_open", {
 })
 
 
-minetest.register_chatcommand(
+minetest.register_chatcommand("area_openfarming", {
-	"area_openfarming", {
+	params = "<ID>",
-		params = "<ID>",
+	description = "Toggle an area open (anyone can interact farming) or closed",
-		description = "Toggle an area as open farming (anyone can harvest and plant) or closed",
+	func = function(name, param)
-		func = function(name, param)
+		local id = tonumber(param)
-			local id = tonumber(param)
+		if not id then
-			if not id then
+			return false, "Invalid usage, see /help area_openfarming."
-				return false, "Invalid usage, see /help area_openfarming."
-			end
-			
-			if not areas:isAreaOwner(id, name) then
-				return false, "Area "..id.." does not exist"
-					.." or is not owned by you."
-			end
-			local open = not areas.areas[id].openfarming
-			-- Save false as nil to avoid inflating the DB.
-			areas.areas[id].openfarming = open or nil
-			areas:save()
-			return true, ("Area %s to farming."):format(open and "opened" or "closed")
 		end
-})
 
-if areas.factions_available then
+		if not areas:isAreaOwner(id, name) then
-	minetest.register_chatcommand("area_faction_open", {
+			return false, "Area "..id.." does not exist"
-		params = "<ID>",
+					.." or is not owned by you."
-		description = "Toggle an area open/closed for members in your faction.",
-		func = function(name, param)
-			local id = tonumber(param)
-			if not id then
-				return false, "Invalid usage, see /help area_faction_open."
-			end
-			
-			if not areas:isAreaOwner(id, name) then
-				return false, "Area "..id.." does not exist"
-						.." or is not owned by you."
-			end
-			local open = not areas.areas[id].faction_open
-			-- Save false as nil to avoid inflating the DB.
-			areas.areas[id].faction_open = open or nil
-			areas:save()
-			return true, ("Area %s for faction members."):format(open and "opened" or "closed")
 		end
-	})
+		local openfarming = not areas.areas[id].openfarming
-end
+		-- Save false as nil to avoid inflating the DB.
+		areas.areas[id].openfarming = openfarming or nil
+		areas:save()
+		return true, ("Area %s to farming."):format(openfarming and "opened" or "closed")
+	end
+})
 
 
 minetest.register_chatcommand("move_area", {
@@ -403,9 +379,7 @@ minetest.register_chatcommand("area_info", {
 		elseif has_high_limit then
 			table.insert(lines,
 				"You have extended area protection"..
-					" limits (\"areas_high_limit\" privilege).")
+				" limits (\"areas_high_limit\" privilege).")
-		elseif privs.megabuilder then
-			table.insert(lines, "You are a megabuilder (\"megabuilder\" privilege).")
 		end
 
 		-- Area count
@@ -417,7 +391,7 @@ minetest.register_chatcommand("area_info", {
 		end
 		local count_line = ("You have %d area%s"):format(
 			area_num, area_num == 1 and "" or "s")
-		if privs.areas or privs.megabuilder then
+		if privs.areas then
 			count_line = count_line..
 				" and have no area protection limits."
 		elseif can_prot then
@@ -431,10 +405,10 @@ minetest.register_chatcommand("area_info", {
 			table.insert(lines, ("%s spanning up to %dx%dx%d.")
 				:format(str, size.x, size.y, size.z))
 		end
-		local function priv_limit_info(lpriv, lmax_count, lmax_size)
+		local function priv_limit_info(priv, max_count, max_size)
 			size_info(("Players with the %q privilege"..
 				" can protect up to %d areas"):format(
-					lpriv, lmax_count), lmax_size)
+					priv, max_count), max_size)
 		end
 		if self_prot then
 			if privs.areas then
@@ -442,8 +416,6 @@ minetest.register_chatcommand("area_info", {
 					limit, size_limit)
 				priv_limit_info("areas_high_limit",
 					limit_high, size_limit_high)
-			elseif privs.megabuilder then
-				table.insert(lines, "You can protect areas unlimited in size and number.")
 			elseif has_prot_priv then
 				size_info("You can protect areas", max_size)
 			end
@@ -452,3 +424,64 @@ minetest.register_chatcommand("area_info", {
 		return true, table.concat(lines, "\n")
 	end,
 })
+
+
+--MFF DEBUT crabman(17/09/2015 ) respawn player at in special area(event) if a spawn is set.
+minetest.register_chatcommand("area_addspawn", {
+	params = "<ID>",
+		privs = areas.adminPrivs,
+	description = "Define special spawn for area",
+	func = function(name, param)
+		local id = param:match("^(%d+)")
+		if not id then
+			return false, "Invalid usage, see /help area_addspawn."
+		end
+
+		id = tonumber(id)
+		if not id then
+			return false, "Error, Param id must be int."
+		end
+
+		local player = minetest.get_player_by_name(name)
+		if not player then
+			return false, "Error, there is not player"
+		end
+		local pos = player:getpos()
+		if not pos then
+			return false, "Error, there is not pos."
+		end
+
+		if not areas.areas[id] then
+			return false, "Area ".. id .." does not exist."
+		end
+		areas.areas[id].spawn = pos
+		areas:save()
+		return true, "spawn of area ".. id .." defined."
+	end
+})
+
+minetest.register_chatcommand("area_delspawn", {
+	params = "<ID>",
+		privs = areas.adminPrivs,
+	description = "Delete special spawn of area",
+	func = function(name, param)
+		local id = param:match("^(%d+)")
+		if not id then
+			return false, "Invalid usage, see /help area_delspawn."
+		end
+
+		id = tonumber(id)
+		if not id then
+			return false, "Error, Param id must be int."
+		end
+
+		if not areas.areas[id] then
+			return false, "Area ".. id .." does not exist."
+		end
+		areas.areas[id].spawn = nil
+		areas:save()
+		return true, "spawn of area ".. id .." deleted."
+	end
+})
+-- FIN
+

hud.lua

@@ -1,70 +1,83 @@
 -- This is inspired by the landrush mod by Bremaweb
 
 areas.hud = {}
-areas.hud.refresh = 0
-
-minetest.register_globalstep(function(dtime)
-
-	areas.hud.refresh = areas.hud.refresh + dtime
-	if areas.hud.refresh > areas.config["tick"] then
-		areas.hud.refresh = 0
-	else
-		return
-	end
 
+local function tick()
 	for _, player in pairs(minetest.get_connected_players()) do
 		local name = player:get_player_name()
-		local pos = vector.round(player:get_pos())
+		local pos = vector.round(player:getpos())
-		pos = vector.apply(pos, function(p)
+		local area_text = "No area(s)\n\n"
-			return math.max(math.min(p, 2147483), -2147483)
+		local area_owner_name = ""
-		end)
+		local mod_owner = 0
-		local areaStrings = {}
+		local mod_open = 0
-
+		local mod_farming = 0
+		local area_name = ""
+		local nb_areas = 0
 		for id, area in pairs(areas:getAreasAtPos(pos)) do
-			local faction_info = area.faction_open and areas.factions_available and
+			nb_areas = nb_areas+1
-					factions.get_player_faction(area.owner)
+			if areas:isAreaOwner(id, name) then
-			area.faction_open = faction_info
+				mod_owner = 1
-			table.insert(areaStrings, ("%s [%u] (%s%s%s)")
+			end
-					:format(area.name, id, area.owner,
+
-					area.open and ":open" or area.openfarming and ":openfarming" or "",
+			if area.open then
-					faction_info and ":"..faction_info or ""))
+				mod_open = 1
+			end
+			if area.openfarming then
+				mod_farming = 1
+			end
+
+			if not area.parent then
+				area_owner_name = area.owner
+				area_name = area.name
+			end
 		end
 
-		for i, area in pairs(areas:getExternalHudEntries(pos)) do
+		local icon = "areas_not_area.png"
-			local str = ""
+		if nb_areas > 0 then
-			if area.name then str = area.name .. " " end
+			local plural = ""
-			if area.id then str = str.."["..area.id.."] " end
+			if nb_areas > 1 then
-			if area.owner then str = str.."("..area.owner..")" end
+				plural = "s"
-			table.insert(areaStrings, str)
+			end
+			area_text = ("%s\nOwner: %s\n%u area" .. plural):format(area_name, area_owner_name, nb_areas)
+			icon = ("areas_%u_%u_%u.png"):format(mod_owner, mod_open, mod_farming)
 		end
+		if not areas.hud[name] then
+			areas.hud[name] = {}
+			areas.hud[name].icon = player:hud_add({
+				hud_elem_type = "image",
+				position = {x=0,y=1},
+				scale = {x=1,y=1},
+				offset = {x=26,y=-60},
+				text = icon,
+			})
 
-		local areaString = "Areas:"
+			areas.hud[name].areas_id = player:hud_add({
-		if #areaStrings > 0 then
-			areaString = areaString.."\n"..
-				table.concat(areaStrings, "\n")
-		end
-		local hud = areas.hud[name]
-		if not hud then
-			hud = {}
-			areas.hud[name] = hud
-			hud.areasId = player:hud_add({
 				hud_elem_type = "text",
 				name = "Areas",
 				number = 0xFFFFFF,
 				position = {x=0, y=1},
-				offset = {x=8, y=-24},
+				offset = {x=48, y=-40},
-				text = areaString,
+				text = area_text,
-				scale = {x=200, y=60},
+				scale = {x=1, y=1},
 				alignment = {x=1, y=-1},
 			})
-			hud.oldAreas = areaString
+			areas.hud[name].old_area_text = area_text
-			return
+			areas.hud[name].old_icon = icon
-		elseif hud.oldAreas ~= areaString then
+		else
-			player:hud_change(hud.areasId, "text", areaString)
+			if areas.hud[name].old_area_text ~= area_text then
-			hud.oldAreas = areaString
+				player:hud_change(areas.hud[name].areas_id, "text", area_text)
+				areas.hud[name].old_area_text = area_text
+			end
+			if areas.hud[name].old_icon ~= icon then
+				player:hud_change(areas.hud[name].icon, "text", icon)
+				areas.hud[name].old_icon = icon
+			end
 		end
 	end
-end)
+	minetest.after(1.5, tick)
+end
+
+tick()
 
 minetest.register_on_leaveplayer(function(player)
 	areas.hud[player:get_player_name()] = nil

init.lua

@@ -4,8 +4,6 @@
 
 areas = {}
 
-areas.factions_available = minetest.global_exists("factions")
-
 areas.adminPrivs = {areas=true}
 areas.startTime = os.clock()
 
@@ -25,11 +23,7 @@ minetest.register_privilege("areas", {
 	description = "Can administer areas."
 })
 minetest.register_privilege("areas_high_limit", {
-	description = "Can do more bigger areas."
+	description = "Can can more, bigger areas."
-})
--- Mega_builder privilege -- MFF
-minetest.register_privilege("megabuilder", {
-	description = "Can protect an infinite amount of areas."
 })
 
 if not minetest.registered_privileges[areas.config.self_protection_privilege] then
@@ -38,7 +32,7 @@ if not minetest.registered_privileges[areas.config.self_protection_privilege] th
 	})
 end
 
-if minetest.settings:get_bool("log_mods") then
+if minetest.setting_getbool("log_mod") then
 	local diffTime = os.clock() - areas.startTime
 	minetest.log("action", "areas loaded in "..diffTime.."s.")
 end

internal.lua

@@ -1,19 +1,10 @@
+-- Mega_builder privilege
+minetest.register_privilege("megabuilder","Can protect an infinite amount of areas.")
+
 function areas:player_exists(name)
 	return minetest.get_auth_handler().get_auth(name) ~= nil
 end
 
-local safe_file_write = minetest.safe_file_write
-if safe_file_write == nil then
-	function safe_file_write(path, content)
-		local file, err = io.open(path, "w")
-		if err then
-			return err
-		end
-		file:write(content)
-		file:close()
-	end
-end
-
 -- Save the areas table to a file
 function areas:save()
 	local datastr = minetest.serialize(self.areas)
@@ -21,7 +12,12 @@ function areas:save()
 		minetest.log("error", "[areas] Failed to serialize area data!")
 		return
 	end
-	return safe_file_write(self.config.filename, datastr)
+	local file, err = io.open(self.config.filename, "w")
+	if err then
+		return err
+	end
+	file:write(datastr)
+	file:close()
 end
 
 -- Load the areas table from the save file
@@ -92,11 +88,6 @@ function areas:add(owner, name, pos1, pos2, parent)
 		owner = owner,
 		parent = parent
 	}
-
-	for i=1, #areas.registered_on_adds do
-		areas.registered_on_adds[i](id, self.areas[id])
-	end
-
 	-- Add to AreaStore
 	if self.store then
 		local sid = self.store:insert_area(pos1, pos2, tostring(id))
@@ -129,10 +120,6 @@ function areas:remove(id, recurse)
 		end
 	end
 
-	for i=1, #areas.registered_on_removes do
-		areas.registered_on_removes[i](id)
-	end
-
 	-- Remove main entry
 	self.areas[id] = nil
 
@@ -148,11 +135,6 @@ function areas:move(id, area, pos1, pos2)
 	area.pos1 = pos1
 	area.pos2 = pos2
 
-
-	for i=1, #areas.registered_on_moves do
-		areas.registered_on_moves[i](id, area, pos1, pos2)
-	end
-
 	if self.store then
 		self.store:remove_area(areas.store_ids[id])
 		local sid = self.store:insert_area(pos1, pos2, tostring(id))
@@ -215,15 +197,16 @@ function areas:canPlayerAddArea(pos1, pos2, name)
 				.." the necessary privilege."
 	end
 
-	-- MFF: megabuilders skip checks on size and number of areas
+	-- MFF: megabuilders skip checks on size and number of areas.
-	if not privs.megabuilder then
+	if not privs["megabuilder"] then
+		-- Check size
 		local max_size = privs.areas_high_limit and
-			self.config.self_protection_max_size_high or
+				self.config.self_protection_max_size_high or
-			self.config.self_protection_max_size
+				self.config.self_protection_max_size
 		if
-			(pos2.x - pos1.x) > max_size.x or
+				(pos2.x - pos1.x) > max_size.x or
-			(pos2.y - pos1.y) > max_size.y or
+				(pos2.y - pos1.y) > max_size.y or
-		(pos2.z - pos1.z) > max_size.z then
+				(pos2.z - pos1.z) > max_size.z then
 			return false, "Area is too big."
 		end
 
@@ -235,21 +218,22 @@ function areas:canPlayerAddArea(pos1, pos2, name)
 			end
 		end
 		local max_areas = privs.areas_high_limit and
-			self.config.self_protection_max_areas_high or
+				self.config.self_protection_max_areas_high or
-			self.config.self_protection_max_areas
+				self.config.self_protection_max_areas
 		if count >= max_areas then
 			return false, "You have reached the maximum amount of"
-				.." areas that you are allowed to  protect."
+					.." areas that you are allowed to  protect."
-		end
-
-		-- Check intersecting areas
-		local can, id = self:canInteractInArea(pos1, pos2, name)
-		if not can then
-			local area = self.areas[id]
-			return false, ("The area intersects with %s [%u] (%s).")
-				:format(area.name, id, area.owner)
 		end
 	end
+
+	-- Check intersecting areas
+	local can, id = self:canMakeArea(pos1, pos2, name)  --MFF crabman(25/02/2016) fix areas in areas
+	if not can then
+		local area = self.areas[id]
+		return false, ("The area intersects with %s [%u] (%s).")
+				:format(area.name, id, area.owner)
+	end
+
 	return true
 end
 
@@ -304,3 +288,4 @@ function areas:isAreaOwner(id, name)
 	end
 	return false
 end
+

legacy.lua

@@ -10,7 +10,7 @@ minetest.register_chatcommand("legacy_load_areas", {
 		minetest.chat_send_player(name, "Converting areas...")
 		local version = tonumber(param)
 		if version == 0 then
-			local err = areas:node_ownership_load()
+			err = areas:node_ownership_load()
 			if err then
 				minetest.chat_send_player(name, "Error loading legacy file: "..err)
 				return
@@ -48,7 +48,6 @@ minetest.register_chatcommand("legacy_load_areas", {
 
 function areas:node_ownership_load()
 	local filename = minetest.get_worldpath().."/owners.tbl"
-	local tables, err
 	tables, err = loadfile(filename)
 	if err then
 		return err

mod.conf

@@ -1,2 +0,0 @@
-name = areas
-optional_depends = playerfactions

pos.lua

@@ -11,16 +11,6 @@ areas.set_pos = {}
 areas.pos1 = {}
 areas.pos2 = {}
 
-local LIMIT = 30992 -- this is due to MAPBLOCK_SIZE=16!
-
-local function posLimit(pos)
-	return {
-		x = math.max(math.min(pos.x, LIMIT), -LIMIT),
-		y = math.max(math.min(pos.y, LIMIT), -LIMIT),
-		z = math.max(math.min(pos.z, LIMIT), -LIMIT)
-	}
-end
-
 minetest.register_chatcommand("select_area", {
 	params = "<ID>",
 	description = "Select a area by id.",
@@ -45,7 +35,7 @@ minetest.register_chatcommand("area_pos1", {
 		.." location or the one specified",
 	privs = {},
 	func = function(name, param)
-		local pos
+		local pos = nil
 		local found, _, x, y, z = param:find(
 				"^(-?%d+)[, ](-?%d+)[, ](-?%d+)$")
 		if found then
@@ -53,14 +43,14 @@ minetest.register_chatcommand("area_pos1", {
 		elseif param == "" then
 			local player = minetest.get_player_by_name(name)
 			if player then
-				pos = player:get_pos()
+				pos = player:getpos()
 			else
 				return false, "Unable to get position."
 			end
 		else
 			return false, "Invalid usage, see /help area_pos1."
 		end
-		pos = posLimit(vector.round(pos))
+		pos = vector.round(pos)
 		areas:setPos1(name, pos)
 		return true, "Area position 1 set to "
 				..minetest.pos_to_string(pos)
@@ -72,7 +62,7 @@ minetest.register_chatcommand("area_pos2", {
 	description = "Set area protection region position 2 to your"
 		.." location or the one specified",
 	func = function(name, param)
-		local pos
+		local pos = nil
 		local found, _, x, y, z = param:find(
 				"^(-?%d+)[, ](-?%d+)[, ](-?%d+)$")
 		if found then
@@ -80,14 +70,14 @@ minetest.register_chatcommand("area_pos2", {
 		elseif param == "" then
 			local player = minetest.get_player_by_name(name)
 			if player then
-				pos = player:get_pos()
+				pos = player:getpos()
 			else
 				return false, "Unable to get position."
 			end
 		else
 			return false, "Invalid usage, see /help area_pos2."
 		end
-		pos = posLimit(vector.round(pos))
+		pos = vector.round(pos)
 		areas:setPos2(name, pos)
 		return true, "Area position 2 set to "
 				..minetest.pos_to_string(pos)
@@ -140,12 +130,12 @@ function areas:getPos(playerName)
 end
 
 function areas:setPos1(playerName, pos)
-	areas.pos1[playerName] = posLimit(pos)
+	areas.pos1[playerName] = pos
 	areas.markPos1(playerName)
 end
 
 function areas:setPos2(playerName, pos)
-	areas.pos2[playerName] = posLimit(pos)
+	areas.pos2[playerName] = pos
 	areas.markPos2(playerName)
 end
 

settings.lua

@@ -2,45 +2,42 @@ local world_path = minetest.get_worldpath()
 
 areas.config = {}
 
-local function setting(name, tp, default)
+local function setting(tp, name, default)
-	local full_name = "areas." .. name
+	local full_name = "areas."..name
 	local value
-	if tp == "bool" then
+	if tp == "boolean" then
-		value = minetest.settings:get_bool(full_name)
+		value = minetest.setting_getbool(full_name)
-		default = value == nil and minetest.is_yes(default)
 	elseif tp == "string" then
-		value = minetest.settings:get(full_name)
+		value = minetest.setting_get(full_name)
-	elseif tp == "v3f" then
+	elseif tp == "position" then
 		value = minetest.setting_get_pos(full_name)
-		default = value == nil and minetest.string_to_pos(default)
+	elseif tp == "number" then
-	elseif tp == "float" or tp == "int" then
+		value = tonumber(minetest.setting_get(full_name))
-		value = tonumber(minetest.settings:get(full_name))
-		local v, other = default:match("^(%S+) (.+)")
-		default = value == nil and tonumber(other and v or default)
 	else
-		error("Cannot parse setting type " .. tp)
+		error("Invalid setting type!")
 	end
-
 	if value == nil then
 		value = default
-		assert(default ~= nil, "Cannot parse default for " .. full_name)
 	end
-	--print("add", name, default, value)
 	areas.config[name] = value
 end
 
-local file = io.open(areas.modpath .. "/settingtypes.txt", "r")
-for line in file:lines() do
-	local name, tp, value = line:match("^areas%.(%S+) %(.*%) (%S+) (.*)")
-	if value then
-		setting(name, tp, value)
-	end
-end
-file:close()
-
 --------------
 -- Settings --
 --------------
 
-setting("filename", "string", world_path.."/areas.dat")
+setting("string", "filename", world_path.."/areas.dat")
+
+-- Allow players with a privilege create their own areas
+-- within the maximum size and number.
+setting("boolean",  "self_protection", false)
+setting("string",   "self_protection_privilege", "interact")
+setting("position", "self_protection_max_size",      {x=64,  y=128, z=64})
+setting("number",   "self_protection_max_areas",      4)
+-- For players with the areas_high_limit privilege.
+setting("position", "self_protection_max_size_high", {x=512, y=512, z=512})
+setting("number",   "self_protection_max_areas_high", 32)
+
+-- legacy_table (owner_defs) compatibility.  Untested and has known issues.
+setting("boolean", "legacy_table", false)
 

settingtypes.txt

@@ -1,38 +0,0 @@
-# This file is parsed in "settings.lua". Check regex first.
-
-# Static paths do not work well with settings
-#areas.filename (Configuration file path) string (world_path)/areas.dat
-
-# Allow players with a privilege create their own areas using /protect
-# within the specified size and amount limits.
-areas.self_protection (Self protection) bool false
-
-# Self protection: Privilege required to protect an area
-areas.self_protection_privilege (Self protection: Required privs) string interact
-
-# Refresh delay for the name displays in the HUD in seconds
-areas.tick (HUD update delay) float 0.5 0 100
-
-# Enable the legacy owner_defs metatable mode. Untested and possibly unstable
-areas.legacy_table (Legacy owner_defs metatable) bool false
-
-[Self protection (normal)]
-
-# Self protection (normal): Maximal size of the protectable area
-# Only enter positive whole numbers for the coordinate values or you'll mess up stuff.
-areas.self_protection_max_size (Maximal area size) v3f (64, 128, 64)
-
-# Self protection (normal): Maximal amount of protected areas per player
-areas.self_protection_max_areas (Maximal area count) int 4
-
-[Self protection (high)]
-
-# Self protection (normal): Maximal size of the protectable area
-# This setting applies for plyaers with the privilege 'areas_high_limit'
-areas.self_protection_max_size_high (Maximal area size) v3f (512, 512, 512)
-
-# Self protection (normal): Maximal amount of protected areas per player
-# Only enter positive whole numbers for the coordinate values or you'll mess up stuff.
-# This setting applies for plyaers with the privilege 'areas_high_limit'
-areas.self_protection_max_areas_high (Maximal area count) float 32
-