Consider mp_halftime in max rounds

abnerfs · Feb 25, 2024 · 139443b · 139443b
1 parent 02df466
commit 139443b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Core/MaxRoundsManager.cs b/Core/MaxRoundsManager.cs
@@ -13,7 +13,10 @@ public class MaxRoundsManager : IPluginDependency<Plugin, Config>
 
         private GameRules _gameRules;
         private ConVar? _maxRounds;
-        private int MaxRoundsValue => _maxRounds!.GetPrimitiveValue<int>();
+        private ConVar? _halfTime;
+        private int MaxRoundsValue => _maxRounds?.GetPrimitiveValue<int>() ?? 0;
+        private bool HalfTime => _halfTime?.GetPrimitiveValue<bool>() ?? true;
+
         public bool UnlimitedRounds => MaxRoundsValue <= 0;
         private bool _lastBeforeHalf = false;
         public int RemainingRounds
@@ -43,6 +46,9 @@ public int MaxWins
                 if (MaxRoundsValue <= 0)
                     return 0;
 
+                if (!HalfTime)
+                    return MaxRoundsValue;
+
                 return ((int)Math.Floor(MaxRoundsValue / 2M)) + 1;
             }
         }
@@ -57,6 +63,7 @@ public MaxRoundsManager(GameRules gameRules)
         void LoadCvar()
         {
             _maxRounds = ConVar.Find("mp_maxrounds");
+            _halfTime = ConVar.Find("mp_halftime");
         }
 
 

diff --git a/Plugin.cs b/Plugin.cs
@@ -21,7 +21,7 @@ public void ConfigureServices(IServiceCollection serviceCollection)
     public partial class Plugin : BasePlugin, IPluginConfig<Config>
     {
         public override string ModuleName => "RockTheVote";
-        public override string ModuleVersion => "1.7.1";
+        public override string ModuleVersion => "1.7.2";
         public override string ModuleAuthor => "abnerfs";
         public override string ModuleDescription => "General purpose map voting plugin";