Unstable 1.1.14.0

2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
@@ -30,6 +30,12 @@ namespace Barotrauma

        public static T HighestVoted<T>(VoteType voteType, IEnumerable<Client> voters)
        {
+            return HighestVoted<T>(voteType, voters, out _);
+        }
+
+        public static T HighestVoted<T>(VoteType voteType, IEnumerable<Client> voters, out int voteCount)
+        {
+            voteCount = 0;
            if (voteType == VoteType.Sub && !GameMain.NetworkMember.ServerSettings.AllowSubVoting) { return default; }
            if (voteType == VoteType.Mode && !GameMain.NetworkMember.ServerSettings.AllowModeVoting) { return default; }

@@ -52,7 +58,7 @@ namespace Barotrauma
                    selected = votable.Key;
                }
            }
-
+            voteCount = highestVotes;
            return selected;            
        }
    }