OBT/1.2.1(Summer update)

Sync with upstream
2026-06-16 22:17:29 +08:00
parent 59bc21973a
commit d109c8f827
85 changed files with 1377 additions and 497 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)
                        {