diff --git a/README.md b/README.md
index 8e9fe74..40e4043 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ Some additional commands are only executable by the players possessing the `tour
 ## Settings
 
 * `pvpplus.enable_sound_loop = true`: whether to play a looped epic music during the tournament
+* `pvpplus.default_pvp_state = false`: PvP state given to players when they join the game
 
 ## API
 
diff --git a/pvp.lua b/pvp.lua
index 25e8156..f143945 100644
--- a/pvp.lua
+++ b/pvp.lua
@@ -149,7 +149,7 @@ pvpplus.tournament_on_punchplayer = nil
 
 minetest.register_on_joinplayer(function(player)
 	local name = player:get_player_name()
-	pvptable[name] = {state = false}
+	pvptable[name] = {state = minetest.settings:get_bool("pvpplus.default_pvp_state") or false}
 	pvptable[name].nopvppic = player:hud_add({
 		hud_elem_type = "image",
 		position = {x = 1, y = 0},
diff --git a/tournament.lua b/tournament.lua
index b484a39..870bb60 100644
--- a/tournament.lua
+++ b/tournament.lua
@@ -129,7 +129,7 @@ function pvpplus.start_tournament()
 			to_player = player,
 			gain = 1.0,
 		})
-		if minetest.setting_getbool("pvpplus.enable_sound_loop") ~= false then -- If it's true or nil (unset)
+		if minetest.settings:get_bool("pvpplus.enable_sound_loop") ~= false then -- If it's true or nil (unset)
 			minetest.after(10, function(name)
 				tournament.sound_handles[name] = minetest.sound_play("pvpplus_tournament_loop", {
 					to_player = name,
@@ -145,8 +145,8 @@ function pvpplus.start_tournament()
 	tournament.teleport_immediately = false
 
 	-- Set the player transfer distance
-	previous_player_transfer_distance = minetest.setting_get("player_transfer_distance")
-	minetest.setting_set("player_transfer_distance", 0) -- 0 = unlimited
+	previous_player_transfer_distance = minetest.settings:get("player_transfer_distance")
+	minetest.settings:set("player_transfer_distance", 0) -- 0 = unlimited
 
 	-- Send the final chat message
 	pvpplus.chat_send_tournament(chat_message, true)
@@ -272,7 +272,7 @@ function pvpplus.stop_tournament()
 	}
 
 	-- Change the player transfer distance back
-	minetest.setting_set("player_transfer_distance", previous_player_transfer_distance)
+	minetest.settings:set("player_transfer_distance", previous_player_transfer_distance)
 end
 
 function pvpplus.allow_engaging(starter_name, teleport)