Merge remote-tracking branch 'upstream/master' into develop

2026-06-16 09:40:27 -03:00
parent a729269763 06616535f4
commit c1073ff3d2
74 changed files with 1167 additions and 408 deletions
@@ -904,7 +904,10 @@ namespace Barotrauma.Networking
                        string subHash = inc.ReadString();
                        CampaignSettings settings = INetSerializableStruct.Read<CampaignSettings>(inc);

-                        var matchingSub = SubmarineInfo.SavedSubmarines.FirstOrDefault(s => s.Name == subName && s.MD5Hash.StringRepresentation == subHash);
+                        var matchingSub =
+                            ServerSettings.AllowSubVoting ? 
+                                Voting.HighestVoted<SubmarineInfo>(VoteType.Sub, connectedClients) : 
+                                SubmarineInfo.SavedSubmarines.FirstOrDefault(s => s.Name == subName && s.MD5Hash.StringRepresentation == subHash);

                        if (GameStarted)
                        {