Some management of AreaStore.

Preliminary.

init.lua

@@ -2,10 +2,35 @@
 -- Copyright 2016 James Stevenson (everamzah)
 -- LGPL v2.1+
 
+local pvp_areas_worlddir = minetest.get_worldpath()
+local pvp_areas_modname = minetest.get_current_modname()
 
-local pvp_areas = {}
 local pvp_areas_store = AreaStore()
-pvp_areas_store:from_file(minetest.get_worldpath() .. "/pvp_areas_store.dat")
+pvp_areas_store:from_file(pvp_areas_worlddir .. "/pvp_areas_store.dat")
+
+local pvp_default = minetest.setting_getbool("pvp_areas_enable_pvp")
+if pvp_default == nil then
+	pvp_default = true
+end
+minetest.log("action", "[" .. pvp_areas_modname .. "] PvP by Default: " .. tostring(pvp_default))
+
+local pvp_areas_players = {}
+local pvp_areas = {}
+
+local function update_pvp_areas()
+	local counter = 0
+	pvp_areas = {}
+	while pvp_areas_store:get_area(counter) do
+		table.insert(pvp_areas, pvp_areas_store:get_area(counter))
+		counter = counter + 1
+	end
+end
+update_pvp_areas()
+
+local function save_pvp_areas()
+	pvp_areas_store:to_file(pvp_areas_worlddir .. "/pvp_areas_store.dat")
+end
+
 
 -- Register privilege and chat command.
 minetest.register_privilege("pvp_areas_admin", "Can set and remove PvP areas.")
@@ -17,43 +42,82 @@ minetest.register_chatcommand("pvp_areas", {
 	func = function(name, param)
 		local pos = vector.round(minetest.get_player_by_name(name):getpos())
 		if param == "pos1" then
-			if not pvp_areas[name] then
-				pvp_areas[name] = {pos1 = pos}
+			if not pvp_areas_players[name] then
+				pvp_areas_players[name] = {pos1 = pos}
 			else
-				pvp_areas[name].pos1 = pos
+				pvp_areas_players[name].pos1 = pos
 			end
 			minetest.chat_send_player(name, "Position 1: " .. minetest.pos_to_string(pos))
 		elseif param == "pos2" then
-			if not pvp_areas[name] then
-				pvp_areas[name] = {pos2 = pos}
+			if not pvp_areas_players[name] then
+				pvp_areas_players[name] = {pos2 = pos}
 			else
-				pvp_areas[name].pos2 = pos
+				pvp_areas_players[name].pos2 = pos
 			end
 			minetest.chat_send_player(name, "Position 2: " .. minetest.pos_to_string(pos))
 		elseif param == "set" then
-			if not pvp_areas[name] or not pvp_areas[name].pos1 then
+			if not pvp_areas_players[name] or not pvp_areas_players[name].pos1 then
 				minetest.chat_send_player(name, "Position 1 missing, use \"/pvp_areas pos1\" to set.")
-			elseif not pvp_areas[name].pos2 then
+			elseif not pvp_areas_players[name].pos2 then
 				minetest.chat_send_player(name, "Position 2 missing, use \"/pvp_areas pos2\" to set.")
 			else
-				minetest.chat_send_player(name, "Setting.")
-				pvp_areas_store:insert_area(pvp_areas[name].pos1, pvp_areas[name].pos2, "pvp_areas")
-				pvp_areas_store:to_file(minetest.get_worldpath() .. "/pvp_areas_store.dat")
+				pvp_areas_store:insert_area(pvp_areas_players[name].pos1, pvp_areas_players[name].pos2, "pvp_areas")
+				table.insert(pvp_areas, pvp_areas_store:get_area(#pvp_areas))
+				update_pvp_areas()
+				save_pvp_areas()
+				pvp_areas_players[name] = nil
+				minetest.chat_send_player(name, "Area set.")
 			end
-		elseif param == "remove" then
-			minetest.chat_send_player(name, "Removing.")
-		else
+		elseif param:sub(1, 6) == "remove" then
+			local n = tonumber(param:sub(8, -1))
+			if n and pvp_areas_store:get_area(n) then
+				pvp_areas_store:remove_area(n)
+				if pvp_areas_store:get_area(n + 1) then
+					-- Insert last entry in new empty (removed) slot.
+					local a = pvp_areas_store:get_area(#pvp_areas - 1)
+					pvp_areas_store:remove_area(#pvp_areas - 1)
+					pvp_areas_store:insert_area(a.min, a.max, "pvp_areas", n)
+				end
+				update_pvp_areas()
+				save_pvp_areas()
+				minetest.chat_send_player(name, "Removed " .. tostring(n))
+			else
+				minetest.chat_send_player(name, "Invalid argument.  You must enter a valid area identifier.")
+			end
+		elseif param ~= "" then
 			minetest.chat_send_player(name, "Invalid usage.  Type \"/help pvp_areas\" for more information.")
+		else
+			minetest.chat_send_player(name, "Listing information to STDOUT.")
+			print()
+			print("---")
+			for i = 0, #pvp_areas - 1 do
+				print(dump(pvp_areas_store:get_area(i)))
+			end
+			print()
 		end
 	end
 })
 
 -- Register punchplayer callback.
 minetest.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool_capabilities, dir, damage)
+	if damage < 1 then
+		return false
+	end
+
 	for k, v in pairs(pvp_areas_store:get_areas_for_pos(player:getpos())) do
 		if k then
-			return false
+			if pvp_default then
+				return true
+			else
+				return false
+			end
 		end
 	end
-	return true
+
+	-- player is not in a pvp_areas_store area.
+	if pvp_default then
+		return false
+	else
+		return true
+	end
 end)