Add option to enable PvP by default

chatcommands.lua

@@ -493,7 +493,7 @@ minetest.register_chatcommand("area_pvp", {
 				S("Area @1 does not exist or is not owned by you.", id)
 		end
 
-		local canPvP = areas.areas[id].canPvP
+		local canPvP = areas:canPvP(id)
 
 		if not canPvP then
 			local players = {}
@@ -513,8 +513,12 @@ minetest.register_chatcommand("area_pvp", {
 			end
 		end
 
-		-- Save false as nil to avoid inflating the DB.
-		areas.areas[id].canPvP = not canPvP or nil
+		if areas.config.pvp_by_default == not canPvP then
+			-- Save the default value as nil to avoid inflating the DB.
+			areas.areas[id].canPvP = nil
+		else
+			areas.areas[id].canPvP = not canPvP
+		end
 		areas:save()
 		return true, S("PvP is @1 in area @2.",
 			not canPvP and S("enabled") or S("disabled"), id)

hud.lua

@@ -14,7 +14,12 @@ local function createAreaString(area, id)
 		tinsert(parts, " [" .. S("Open") .. "]")
 	end
 
-	if area.canPvP and not creative_mode then
+	if areas.config.pvp_by_default then
+		-- Compare with false as nil = default
+		if area.canPvP == false and not creative_mode then
+			tinsert(parts, " [" .. S("PvP disabled") .. "]")
+		end
+	elseif area.canPvP and not creative_mode then
 		tinsert(parts, " [" .. S("PvP enabled") .. "]")
 	end
 

interact.lua

@@ -38,14 +38,16 @@ minetest.register_on_protection_violation(function(pos, name)
 end)
 
 local function can_pvp_at(pos)
+	local default = areas.config.pvp_by_default
 	for id in pairs(areas:getAreasAtPos(pos)) do
 		-- This uses areas:canPvP instead of area.canPvP in case areas:canPvP
 		-- is overridden
-		if areas:canPvP(id) then
-			return true
+		local value = areas:canPvP(id)
+		if value ~= default then
+			return value
 		end
 	end
-	return false
+	return default
 end
 
 minetest.register_on_punchplayer(function(player, hitter, time_from_last_punch)

internal.lua

@@ -167,11 +167,10 @@ end
 -- @returns true or false (enabled or disabled)
 function areas:canPvP(id)
 	local area = self.areas[id]
-	if not area then
-		return true
+	if not area or area.canPvP == nil then
+		return areas.config.pvp_by_default
 	end
-	-- canPvP is nil when false
-	return area.canPvP or false
+	return area.canPvP
 end
 
 -- Checks if a area between two points is entirely contained by another area.

settings.lua

@@ -28,6 +28,7 @@ end
 --------------
 
 setting("string", "filename", world_path.."/areas.dat")
+setting("boolean", "pvp_by_default", false)
 
 -- Allow players with a privilege create their own areas
 -- within the maximum size and number.

settingtypes.txt

@@ -3,6 +3,9 @@
 # Static paths do not work well with settings
 #areas.filename (Configuration file path) string (world_path)/areas.dat
 
+# When enabled, makes PvP opt-out rather than opt-in.
+areas.pvp_by_default (PvP by default) bool false
+
 # 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