Fix map winner selection

Commands/EndMapVoteManager.cs

@@ -1,6 +1,5 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Core.Plugin;
 using CounterStrikeSharp.API.Modules.Menu;
 using CounterStrikeSharp.API.Modules.Timers;
 using System.Data;
@@ -9,6 +8,21 @@
 
 namespace cs2_rockthevote
 {
+    //public partial class Plugin
+    //{
+
+    //    [ConsoleCommand("votebot", "Votes to rock the vote")]
+    //    public void VoteBot(CCSPlayerController? player, CommandInfo? command)
+    //    {
+    //        var bot = ServerManager.ValidPlayers().FirstOrDefault(x => x.IsBot);
+    //        if(bot is not null)
+    //        {
+    //            _endmapVoteManager.MapVoted(bot, "de_dust2");
+    //        }
+    //    }
+
+    //}
+
     public class EndMapVoteManager : IPluginDependency<Plugin, Config>
     {
         public EndMapVoteManager(MapLister mapLister, ChangeMapManager changeMapManager, NominationCommand nominationManager, StringLocalizer localizer, PluginState pluginState)
@@ -96,17 +110,20 @@ void VoteDisplayTick(int time)
         void EndVote()
         {
             KillTimer();
-            var winner = Votes.OrderByDescending(x => x.Value).First();
-            var totalVotes = Votes.Select(x => x.Value).Sum();
-            var percent = totalVotes > 0 ? (winner.Value / totalVotes) * 100 : 0;
-            if (percent > 0)
+            decimal maxVotes = Votes.Select(x => x.Value).Max();
+            IEnumerable<KeyValuePair<string, int>> potentialWinners = Votes.Where(x => x.Value == maxVotes);
+            Random rnd = new();
+            KeyValuePair<string, int> winner = potentialWinners.ElementAt(rnd.Next(0, potentialWinners.Count()));
+
+            decimal totalVotes = Votes.Select(x => x.Value).Sum();
+            decimal percent = totalVotes > 0 ? (winner.Value / totalVotes) * 100M : 0;
+            //Server.PrintToChatAll($"Total {totalVotes}, winner {winner.Value}, Percent {percent}");
+            if (maxVotes > 0)
             {
                 Server.PrintToChatAll(_localizer.LocalizeWithPrefix("emv.vote-ended", winner.Key, percent, totalVotes));
             }
             else
             {
-                var rnd = new Random();
-                winner = Votes.ElementAt(rnd.Next(0, Votes.Count));
                 Server.PrintToChatAll(_localizer.LocalizeWithPrefix("emv.vote-ended-no-votes", winner.Key));
             }
 
@@ -133,6 +150,7 @@ IList<T> Shuffle<T>(Random rng, IList<T> array)
 
         public void StartVote(EndOfMapConfig config)
         {
+            Votes.Clear();
             _pluginState.EofVoteHappening = true;
             _config = config;
             var mapsToShow = _config!.MapsToShow == 0 ? 5 : _config!.MapsToShow;
@@ -147,13 +165,9 @@ public void StartVote(EndOfMapConfig config)
                 menu.AddMenuOption(map, (player, option) => MapVoted(player, map));
             }
 
-            foreach (var player in Utilities.GetPlayers())
-            {
-                if (player.IsValid)
-                {
-                    ChatMenus.OpenMenu(player, menu);
-                }
-            }
+            foreach (var player in ServerManager.ValidPlayers())
+                MenuManager.OpenChatMenu(player, menu);
+
             timeLeft = _config.VoteDuration;
             Timer = _plugin!.AddTimer(1.0F, () =>
             {

Plugin.cs

@@ -20,7 +20,7 @@ public void ConfigureServices(IServiceCollection serviceCollection)
     public partial class Plugin : BasePlugin, IPluginConfig<Config>
     {
         public override string ModuleName => "RockTheVote";
-        public override string ModuleVersion => "1.1.3";
+        public override string ModuleVersion => "1.1.4";
         public override string ModuleAuthor => "abnerfs";
         public override string ModuleDescription => "General purpose map voting plugin";
 
@@ -32,14 +32,16 @@ public partial class Plugin : BasePlugin, IPluginConfig<Config>
         private readonly RockTheVoteCommand _rtvManager;
         private readonly GameRules _gameRules;
         private readonly TimeLeftCommand _timeLeft;
+        private readonly EndMapVoteManager _endmapVoteManager;
 
         public Plugin(DependencyManager<Plugin, Config> dependencyManager,
             NominationCommand nominationManager,
             ChangeMapManager changeMapManager,
             VotemapCommand voteMapManager,
             RockTheVoteCommand rtvManager,
             GameRules gameRules,
-            TimeLeftCommand timeLeft)
+            TimeLeftCommand timeLeft,
+            EndMapVoteManager endmapVoteManager)
         {
             _dependencyManager = dependencyManager;
             _nominationManager = nominationManager;
@@ -48,6 +50,7 @@ public Plugin(DependencyManager<Plugin, Config> dependencyManager,
             _rtvManager = rtvManager;
             _gameRules = gameRules;
             _timeLeft = timeLeft;
+            _endmapVoteManager = endmapVoteManager;
         }
 
         public Config? Config { get; set; }