From 43cc59e2464e5eb9c10963fc3398c311d2b5c909 Mon Sep 17 00:00:00 2001
From: Lukas Bagaric <deaeod@gmail.com>
Date: Fri, 17 Mar 2023 11:35:25 +0100
Subject: [PATCH] Add Setting bAlwaysUseDefaultMap

---
 Classes/MutVoteSys.uc        | 3 ++-
 Classes/VS_ServerSettings.uc | 2 ++
 README.md                    | 9 +++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Classes/MutVoteSys.uc b/Classes/MutVoteSys.uc
index 26c15b7..49198d8 100644
--- a/Classes/MutVoteSys.uc
+++ b/Classes/MutVoteSys.uc
@@ -641,7 +641,8 @@ function TallyVotes() {
 			Level.Game.SetPropertyText("bDontRestart", "False");
 			return;
 		}
-		M = Info.ResolveMapOfPreset(DefaultPresetRef, Settings.DefaultMap);
+		if (Settings.bAlwaysUseDefaultMap || bChangeMapImmediately)
+			M = Info.ResolveMapOfPreset(DefaultPresetRef, Settings.DefaultMap);
 		if (M == none)
 			M = SelectRandomMapFromList(DefaultPresetRef.MapList);
 		if (M == none)
diff --git a/Classes/VS_ServerSettings.uc b/Classes/VS_ServerSettings.uc
index ed8f12a..f542255 100644
--- a/Classes/VS_ServerSettings.uc
+++ b/Classes/VS_ServerSettings.uc
@@ -32,6 +32,7 @@ var config int IdleTimeout;
 var config int MinimumMapRepeatDistance;
 var config int PresetProbeDepth;
 var config bool bChangeGameNameForPresets;
+var config bool bAlwaysUseDefaultMap;
 
 defaultproperties {
 	MidGameVoteThreshold=0.5
@@ -57,4 +58,5 @@ defaultproperties {
 	MinimumMapRepeatDistance=0
 	PresetProbeDepth=1
 	bChangeGameNameForPresets=False
+	bAlwaysUseDefaultMap=False
 }
diff --git a/README.md b/README.md
index be30c45..3dcb983 100644
--- a/README.md
+++ b/README.md
@@ -66,6 +66,8 @@ bManageServerPackages=False
 bUseServerActorsCompatibilityMode=False
 PresetProbeDepth=1
 IdleTimeout=0
+bChangeGameNameForPresets=False
+bAlwaysUseDefaultMap=False
 DefaultPackages=SoldierSkins
 DefaultPackages=CommandoSkins
 DefaultPackages=FCommandoSkins
@@ -234,6 +236,13 @@ If true, changes the `GameName` property of the gamemode to the full preset name
 
 Defaults to false.
 
+#### bAlwaysUseDefaultMap
+
+If true, uses the `DefaultMap` setting whenever switching maps without any votes by players.  
+If false, only uses the `DefaultMap` setting when recovering from crashes or server restarts.
+
+Defaults to false.
+
 ### VoteSysPresets.ini
 ```ini
 [VS_PresetConfig0]