Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git

2022-02-24 14:30:39 -03:00
parent db7a6a0bea 102e089aa6
commit 6340304ae4
364 changed files with 10838 additions and 3966 deletions
@@ -39,7 +39,7 @@ namespace Barotrauma.Networking
                string orderOption = orderMessageInfo.OrderOption ??
                    (orderMessageInfo.OrderOptionIndex == null || orderMessageInfo.OrderOptionIndex < 0 || orderMessageInfo.OrderOptionIndex >= orderPrefab.Options.Length ?
                        "" : orderPrefab.Options[orderMessageInfo.OrderOptionIndex.Value]);
-                orderMsg = new OrderChatMessage(orderPrefab, orderOption, orderMessageInfo.Priority, orderTargetPosition ?? orderTargetEntity as ISpatialEntity, orderTargetCharacter, c.Character)
+                orderMsg = new OrderChatMessage(orderPrefab, orderOption, orderMessageInfo.Priority, orderTargetPosition ?? orderTargetEntity as ISpatialEntity, orderTargetCharacter, c.Character, isNewOrder: orderMessageInfo.IsNewOrder)
                {
                    WallSectionIndex = wallSectionIndex
                };
@@ -223,6 +223,11 @@ namespace Barotrauma.Networking
            {
                msg.Write(Sender.ID);
            }
+            msg.Write(customTextColor != null);
+            if (customTextColor != null)
+            {
+                msg.WriteColorR8G8B8A8(customTextColor.Value);
+            }
            msg.WritePadBits();
            if (Type == ChatMessageType.ServerMessageBoxInGame)
            {
@@ -117,8 +117,14 @@ namespace Barotrauma.Networking
        {
            GameMain.Server.VoipServer.UnregisterQueue(VoipQueue);
            VoipQueue.Dispose();
-            characterInfo?.Remove();
-            characterInfo = null;
+            if (characterInfo != null)
+            {
+                if (characterInfo.Character == null || characterInfo.Character.Removed)
+                {
+                    characterInfo?.Remove();
+                    characterInfo = null;
+                }
+            }
        }

        public void InitClientSync()
@@ -222,33 +222,6 @@ namespace Barotrauma.Networking
                if (shuttle != null) { GameMain.NetLobbyScreen.SelectedShuttle = shuttle; }
            }

-            List<SubmarineInfo> campaignSubs = new List<SubmarineInfo>();
-            if (serverSettings.CampaignSubmarines != null && serverSettings.CampaignSubmarines.Length > 0)
-            {
-                string[] submarines = serverSettings.CampaignSubmarines.Split(ServerSettings.SubmarineSeparatorChar);
-                for (int i = 0; i < submarines.Length; i++)
-                {
-                    SubmarineInfo subInfo = SubmarineInfo.SavedSubmarines.FirstOrDefault(s => s.Name == submarines[i]);
-                    if (subInfo != null && subInfo.IsCampaignCompatible)
-                    {
-                        campaignSubs.Add(subInfo);
-                    }
-                }
-            }
-            else
-            {
-                // Add vanilla submarines by default
-                for (int i = 0; i < SubmarineInfo.SavedSubmarines.Count(); i++)
-                {
-                    SubmarineInfo subInfo = SubmarineInfo.SavedSubmarines.ElementAt(i);
-                    if (subInfo.IsVanillaSubmarine() && subInfo.IsCampaignCompatible)
-                    {
-                        campaignSubs.Add(SubmarineInfo.SavedSubmarines.ElementAt(i));
-                    }
-                }
-            }
-            GameMain.NetLobbyScreen.CampaignSubmarines = campaignSubs;
-
            started = true;

            GameAnalyticsManager.AddDesignEvent("GameServer:Start");
@@ -763,7 +736,15 @@ namespace Barotrauma.Networking
                    }
                    break;
                case ClientPacketHeader.REQUEST_STARTGAMEFINALIZE:
-                    if (gameStarted && connectedClient != null)
+                    if (connectedClient == null)
+                    {
+                        DebugConsole.AddWarning("Received a REQUEST_STARTGAMEFINALIZE message. Client not connected, ignoring the message.");
+                    }
+                    else if (!gameStarted)
+                    {
+                        DebugConsole.AddWarning("Received a REQUEST_STARTGAMEFINALIZE message. Game not started, ignoring the message.");
+                    }
+                    else
                    {
                        SendRoundStartFinalize(connectedClient);
                    }
@@ -783,7 +764,7 @@ namespace Barotrauma.Networking
                        string seed = inc.ReadString();
                        string subName = inc.ReadString();
                        string subHash = inc.ReadString();
-                        CampaignSettings settings = new CampaignSettings(inc);
+                        CampaignSettings settings = new CampaignSettings(inc);    

                        var matchingSub = SubmarineInfo.SavedSubmarines.FirstOrDefault(s => s.Name == subName && s.MD5Hash.Hash == subHash);

@@ -806,6 +787,7 @@ namespace Barotrauma.Networking
                            {
                                ServerSettings.RadiationEnabled = settings.RadiationEnabled;
                                ServerSettings.MaxMissionCount = settings.MaxMissionCount;
+                                ServerSettings.SaveSettings();
                                MultiPlayerCampaign.StartNewCampaign(localSavePath, matchingSub.FilePath, seed, settings);
                            }
                        }
@@ -845,6 +827,9 @@ namespace Barotrauma.Networking
                case ClientPacketHeader.CREW:
                    ReadCrewMessage(inc, connectedClient);
                    break;
+                case ClientPacketHeader.MEDICAL:
+                    ReadMedicalMessage(inc, connectedClient);
+                    break;
                case ClientPacketHeader.READY_CHECK:
                    ReadyCheck.ServerRead(inc, connectedClient);
                    break;
@@ -885,6 +870,12 @@ namespace Barotrauma.Networking
                case ClientNetError.MISSING_ENTITY:
                    UInt16 eventID = inc.ReadUInt16();
                    UInt16 entityID = inc.ReadUInt16();
+                    byte subCount = inc.ReadByte();
+                    List<string> subNames = new List<string>();
+                    for (int i = 0; i < subCount; i++)
+                    {
+                        subNames.Add(inc.ReadString());
+                    }
                    Entity entity = Entity.FindEntityByID(entityID);
                    if (entity == null)
                    {
@@ -892,16 +883,23 @@ namespace Barotrauma.Networking
                    }
                    else if (entity is Character character)
                    {
-                        errorStr = "Missing character " + character.Name + " (event id " + eventID.ToString() + ", entity id " + entityID.ToString() + ").";
-                        errorStrNoName = "Missing character " + character.SpeciesName + "(event id " + eventID.ToString() + ", entity id " + entityID.ToString() + ").";
+                        errorStr = $"Missing character {character.Name} (event id {eventID}, entity id {entityID}).";
+                        errorStrNoName = $"Missing character {character.SpeciesName}  (event id {eventID}, entity id {entityID}).";
                    }
                    else if (entity is Item item)
                    {
-                        errorStr = errorStrNoName = "Missing item " + item.Name + " (event id " + eventID.ToString() + ", entity id " + entityID.ToString() + ").";
+                        errorStr = errorStrNoName = $"Missing item {item.Name}, sub: {item.Submarine?.Info?.Name ?? "none"} (event id {eventID}, entity id {entityID}).";
                    }
                    else
                    {
-                        errorStr = errorStrNoName = "Missing entity " + entity.ToString() + " (event id " + eventID.ToString() + ", entity id " + entityID.ToString() + ").";
+                        errorStr = errorStrNoName = $"Missing entity {entity}, sub: {entity.Submarine?.Info?.Name ?? "none"} (event id {eventID}, entity id {entityID}).";
+                    }
+                    var serverSubNames = Submarine.Loaded.Select(s => s.Info.Name);
+                    if (subCount != Submarine.Loaded.Count || !subNames.SequenceEqual(serverSubNames))
+                    {
+                        string subErrorStr =  $" Loaded submarines don't match (client: {string.Join(", ", subNames)}, server: {string.Join(", ", serverSubNames)}).";
+                        errorStr += subErrorStr;
+                        errorStrNoName += subErrorStr;
                    }
                    break;
            }
@@ -1247,6 +1245,14 @@ namespace Barotrauma.Networking
            }
        }

+        private void ReadMedicalMessage(IReadMessage inc, Client sender)
+        {
+            if (GameMain.GameSession?.Campaign is MultiPlayerCampaign mpCampaign)
+            {
+                mpCampaign.MedicalClinic.ServerRead(inc, sender);
+            }
+        }
+
        private void ReadReadyToSpawnMessage(IReadMessage inc, Client sender)
        {
            sender.SpectateOnly = inc.ReadBoolean() && (serverSettings.AllowSpectating || sender.Connection == OwnerConnection);
@@ -1873,27 +1879,10 @@ namespace Barotrauma.Networking
                }
                outmsg.Write(GameMain.NetLobbyScreen.SelectedSub.Name);
                outmsg.Write(GameMain.NetLobbyScreen.SelectedSub.MD5Hash.ToString());
-                outmsg.Write(serverSettings.UseRespawnShuttle);
-                outmsg.Write(GameMain.NetLobbyScreen.SelectedShuttle.Name);
-                outmsg.Write(GameMain.NetLobbyScreen.SelectedShuttle.MD5Hash.ToString());
-
-                List<int> campaignSubIndices = new List<int>();
-                if (GameMain.NetLobbyScreen.SelectedMode == GameModePreset.MultiPlayerCampaign)
-                {
-                    IReadOnlyList<SubmarineInfo> subList = GameMain.NetLobbyScreen.GetSubList();
-                    for (int i = 0; i < subList.Count; i++)
-                    {
-                        if (GameMain.NetLobbyScreen.CampaignSubmarines.Contains(subList[i]))
-                        {
-                            campaignSubIndices.Add(i);
-                        }
-                    }
-                }
-                outmsg.Write((UInt16)campaignSubIndices.Count);
-                foreach (int campaignSubIndex in campaignSubIndices)
-                {
-                    outmsg.Write((UInt16)campaignSubIndex);
-                }
+                outmsg.Write(serverSettings.UseRespawnShuttle || (gameStarted && respawnManager.UsingShuttle));
+                var selectedShuttle = gameStarted && respawnManager.UsingShuttle ? respawnManager.RespawnShuttle.Info : GameMain.NetLobbyScreen.SelectedShuttle;
+                outmsg.Write(selectedShuttle.Name);
+                outmsg.Write(selectedShuttle.MD5Hash.ToString());

                outmsg.Write(serverSettings.Voting.AllowSubVoting);
                outmsg.Write(serverSettings.Voting.AllowModeVoting);
@@ -1954,7 +1943,7 @@ namespace Barotrauma.Networking

            int chatMessageBytes = outmsg.LengthBytes;
            WriteChatMessages(outmsg, c);
-            chatMessageBytes = outmsg.LengthBytes - outmsg.LengthBytes;
+            chatMessageBytes = outmsg.LengthBytes - chatMessageBytes;

            outmsg.Write((byte)ServerNetObject.END_OF_MESSAGE);
            
@@ -1977,7 +1966,11 @@ namespace Barotrauma.Networking
                    warningMsg +=
                        "    Settings buffer size: " + settingsBuf.LengthBytes + " bytes\n";
                }
-                if (GameSettings.VerboseLogging) { DebugConsole.AddWarning(warningMsg); }
+#if DEBUG || UNSTABLE
+                DebugConsole.ThrowError(warningMsg);
+#else
+                if (GameSettings.VerboseLogging) { DebugConsole.AddWarning(warningMsg); }                
+#endif
                GameAnalyticsManager.AddErrorEventOnce("GameServer.ClientWriteIngame1:ClientWriteLobby" + outmsg.LengthBytes, GameAnalyticsManager.ErrorSeverity.Warning, warningMsg);
            }
            
@@ -1993,12 +1986,16 @@ namespace Barotrauma.Networking
                //these large initial messages until the client acknowledges receiving them
                c.LastRecvLobbyUpdate++;

-                SendVoteStatus(new List<Client>() { c });
            }
            else
            {
                serverPeer.Send(outmsg, c.Connection, DeliveryMethod.Unreliable);
            }
+
+            if (isInitialUpdate)
+            {
+                SendVoteStatus(new List<Client>() { c });
+            }
        }

        private void WriteChatMessages(IWriteMessage outmsg, Client c)
@@ -2064,7 +2061,7 @@ namespace Barotrauma.Networking
                msg.Write(selectedSub.Name);
                msg.Write(selectedSub.MD5Hash.Hash);

-                msg.Write(serverSettings.UseRespawnShuttle);
+                msg.Write(serverSettings.UseRespawnShuttle || (gameStarted && respawnManager.UsingShuttle));
                msg.Write(selectedShuttle.Name);
                msg.Write(selectedShuttle.MD5Hash.Hash);

@@ -2182,7 +2179,6 @@ namespace Barotrauma.Networking
            else
            {
                SendStartMessage(roundStartSeed, GameMain.NetLobbyScreen.LevelSeed, GameMain.GameSession, connectedClients, false);
-
                GameMain.GameSession.StartRound(GameMain.NetLobbyScreen.LevelSeed, serverSettings.SelectedLevelDifficulty);
                Log("Game mode: " + selectedMode.Name, ServerLog.MessageType.ServerMessage);
                Log("Submarine: " + selectedSub.Name, ServerLog.MessageType.ServerMessage);
@@ -2202,8 +2198,7 @@ namespace Barotrauma.Networking
                yield return CoroutineStatus.Failure;
            }

-            MissionMode missionMode = GameMain.GameSession.GameMode as MissionMode;
-            bool missionAllowRespawn = missionMode == null || !missionMode.Missions.Any(m => !m.AllowRespawn);
+            bool missionAllowRespawn = !(GameMain.GameSession.GameMode is MissionMode missionMode) || !missionMode.Missions.Any(m => !m.AllowRespawn);
            bool isOutpost = campaign != null && campaign.NextLevel?.Type == LevelData.LevelType.Outpost;

            if (serverSettings.AllowRespawn && missionAllowRespawn)
@@ -2281,7 +2276,7 @@ namespace Barotrauma.Networking
                    characterInfos.Add(client.CharacterInfo);
                    if (client.CharacterInfo.Job == null || client.CharacterInfo.Job.Prefab != client.AssignedJob.First)
                    {
-                        client.CharacterInfo.Job = new Job(client.AssignedJob.First, client.AssignedJob.Second);
+                        client.CharacterInfo.Job = new Job(client.AssignedJob.First, Rand.RandSync.Unsynced, client.AssignedJob.Second);
                    }
                }

@@ -2498,7 +2493,7 @@ namespace Barotrauma.Networking
            msg.Write(serverSettings.LockAllDefaultWires);
            msg.Write(serverSettings.AllowRagdollButton);
            msg.Write(serverSettings.AllowLinkingWifiToChat);
-            msg.Write(serverSettings.UseRespawnShuttle);
+            msg.Write(serverSettings.UseRespawnShuttle || (gameStarted && respawnManager.UsingShuttle));
            msg.Write((byte)serverSettings.LosMode);
            msg.Write(includesFinalize); msg.WritePadBits();

@@ -2510,8 +2505,9 @@ namespace Barotrauma.Networking
                msg.Write(serverSettings.SelectedLevelDifficulty);
                msg.Write(gameSession.SubmarineInfo.Name);
                msg.Write(gameSession.SubmarineInfo.MD5Hash.Hash);
-                msg.Write(GameMain.NetLobbyScreen.SelectedShuttle.Name);
-                msg.Write(GameMain.NetLobbyScreen.SelectedShuttle.MD5Hash.Hash);
+                var selectedShuttle = gameStarted && respawnManager.UsingShuttle ? respawnManager.RespawnShuttle.Info : GameMain.NetLobbyScreen.SelectedShuttle;
+                msg.Write(selectedShuttle.Name);
+                msg.Write(selectedShuttle.MD5Hash.Hash);
                msg.Write((byte)GameMain.GameSession.GameMode.Missions.Count());
                foreach (Mission mission in GameMain.GameSession.GameMode.Missions)
                {
@@ -2966,9 +2962,9 @@ namespace Barotrauma.Networking
            SendDirectChatMessage(msg, recipient);
        }

-        public void SendConsoleMessage(string txt, Client recipient)
+        public void SendConsoleMessage(string txt, Client recipient, Color? color = null)
        {
-            ChatMessage msg = ChatMessage.Create("", txt, ChatMessageType.Console, null);
+            ChatMessage msg = ChatMessage.Create("", txt, ChatMessageType.Console, sender: null, textColor: color);
            SendDirectChatMessage(msg, recipient);
        }

@@ -3219,11 +3215,11 @@ namespace Barotrauma.Networking
                    //too far to hear the msg -> don't send
                    if (!client.Character.CanHearCharacter(message.Sender)) { continue; }
                }
-                SendDirectChatMessage(new OrderChatMessage(message.Order, message.OrderOption, message.OrderPriority, message.TargetEntity, message.TargetCharacter, message.Sender), client);
+                SendDirectChatMessage(new OrderChatMessage(message.Order, message.OrderOption, message.OrderPriority, message.TargetEntity, message.TargetCharacter, message.Sender, isNewOrder: message.IsNewOrder), client);
            }
            if (!string.IsNullOrWhiteSpace(message.Text))
            {
-                AddChatMessage(new OrderChatMessage(message.Order, message.OrderOption, message.OrderPriority, message.Text, message.TargetEntity, message.TargetCharacter, message.Sender));
+                AddChatMessage(new OrderChatMessage(message.Order, message.OrderOption, message.OrderPriority, message.Text, message.TargetEntity, message.TargetCharacter, message.Sender, isNewOrder: message.IsNewOrder));
            }
        }

@@ -3418,14 +3414,40 @@ namespace Barotrauma.Networking
            }
        }

+        public void IncrementStat(Character character, string achievementIdentifier, int amount)
+        {
+            achievementIdentifier = achievementIdentifier.ToLowerInvariant();
+            foreach (Client client in connectedClients)
+            {
+                if (client.Character == character)
+                {
+                    IncrementStat(client, achievementIdentifier, amount);
+                    return;
+                }
+            }
+        }
+
        public void GiveAchievement(Client client, string achievementIdentifier)
        {
-            if (client.GivenAchievements.Contains(achievementIdentifier)) return;
+            if (client.GivenAchievements.Contains(achievementIdentifier)) { return; }
            client.GivenAchievements.Add(achievementIdentifier);

            IWriteMessage msg = new WriteOnlyMessage();
            msg.Write((byte)ServerPacketHeader.ACHIEVEMENT);
            msg.Write(achievementIdentifier);
+            msg.Write(0);
+
+            serverPeer.Send(msg, client.Connection, DeliveryMethod.Reliable);
+        }
+
+        public void IncrementStat(Client client, string achievementIdentifier, int amount)
+        {
+            if (client.GivenAchievements.Contains(achievementIdentifier)) { return; }
+
+            IWriteMessage msg = new WriteOnlyMessage();
+            msg.Write((byte)ServerPacketHeader.ACHIEVEMENT);
+            msg.Write(achievementIdentifier);
+            msg.Write(amount);

            serverPeer.Send(msg, client.Connection, DeliveryMethod.Reliable);
        }
@@ -3779,7 +3801,7 @@ namespace Barotrauma.Networking
                    if (assignedPlayerCount[jobPrefab] >= jobPrefab.MaxNumber) { continue; }

                    var variant = Rand.Range(0, jobPrefab.Variants, Rand.RandSync.Server);
-                    unassignedBots[0].Job = new Job(jobPrefab, variant);
+                    unassignedBots[0].Job = new Job(jobPrefab, Rand.RandSync.Server, variant);
                    assignedPlayerCount[jobPrefab]++;
                    unassignedBots.Remove(unassignedBots[0]);
                    canAssign = true;
@@ -3802,7 +3824,7 @@ namespace Barotrauma.Networking
                {
                    var job = remainingJobs.GetRandom();
                    var variant = Rand.Range(0, job.Variants);
-                    c.Job = new Job(job, variant);
+                    c.Job = new Job(job, Rand.RandSync.Unsynced, variant);
                    assignedPlayerCount[c.Job.Prefab]++;
                }
            }
@@ -3891,16 +3913,6 @@ namespace Barotrauma.Networking

                if (GameMain.NetLobbyScreen.SelectedSub != null) { serverSettings.SelectedSubmarine = GameMain.NetLobbyScreen.SelectedSub.Name; }
                if (GameMain.NetLobbyScreen.SelectedShuttle != null) { serverSettings.SelectedShuttle = GameMain.NetLobbyScreen.SelectedShuttle.Name; }
-                if (GameMain.NetLobbyScreen.CampaignSubmarines != null)
-                {
-                    string submarinesString = string.Empty;
-                    for (int i = 0; i < GameMain.NetLobbyScreen.CampaignSubmarines.Count; i++)
-                    {
-                        submarinesString += GameMain.NetLobbyScreen.CampaignSubmarines[i].Name + ServerSettings.SubmarineSeparatorChar;
-                    }
-                    submarinesString.Trim(ServerSettings.SubmarineSeparatorChar);
-                    serverSettings.CampaignSubmarines = submarinesString;
-                }

                serverSettings.SaveSettings();

@@ -118,14 +118,18 @@ namespace Barotrauma.Networking
            return ShouldStartRespawnCountdown(characterToRespawnCount);
        }

+        private int GetMinCharactersToRespawn()
+        {
+            return Math.Max((int)(GameMain.Server.ConnectedClients.Count * GameMain.Server.ServerSettings.MinRespawnRatio), 1);
+        }
+
        private bool ShouldStartRespawnCountdown(int characterToRespawnCount)
        {
            if (GameMain.Lua.game.overrideRespawnSub)
            {
                characterToRespawnCount = 0;
            }
-            int totalCharacterCount = GameMain.Server.ConnectedClients.Count;
-            return (float)characterToRespawnCount >= Math.Max((float)totalCharacterCount * GameMain.Server.ServerSettings.MinRespawnRatio, 1.0f);
+            return characterToRespawnCount >= GetMinCharactersToRespawn();
        }

        partial void UpdateWaiting(float deltaTime)
@@ -139,7 +143,7 @@ namespace Barotrauma.Networking
            }

            pendingRespawnCount = GetClientsToRespawn().Count();
-            requiredRespawnCount = (int)Math.Max((float)GameMain.Server.ConnectedClients.Count * GameMain.Server.ServerSettings.MinRespawnRatio, 1.0f);
+            requiredRespawnCount = GetMinCharactersToRespawn();
            if (pendingRespawnCount != prevPendingRespawnCount || 
                requiredRespawnCount != prevRequiredRespawnCount)
            {
@@ -372,7 +376,7 @@ namespace Barotrauma.Networking
            {
                if (campaign?.GetClientCharacterData(c) == null || c.CharacterInfo.Job == null)
                {
-                    c.CharacterInfo.Job = new Job(c.AssignedJob.First, c.AssignedJob.Second);
+                    c.CharacterInfo.Job = new Job(c.AssignedJob.First, Rand.RandSync.Unsynced, c.AssignedJob.Second);
                }
            }

@@ -11,6 +11,21 @@ namespace Barotrauma.Networking
 {
    partial class ServerSettings
    {
+        partial class NetPropertyData
+        {
+            private object lastSyncedValue;
+            public UInt16 LastUpdateID { get; private set; }
+
+            public void SyncValue()
+            {
+                if (!PropEquals(lastSyncedValue, Value))
+                {
+                    LastUpdateID = (UInt16)(GameMain.NetLobbyScreen.LastUpdateID);
+                    lastSyncedValue = Value;
+                }
+            }
+        }
+        
        public static readonly string ClientPermissionsFile = "Data" + Path.DirectorySeparatorChar + "clientpermissions.xml";
        public static readonly char SubmarineSeparatorChar = '|';

@@ -35,20 +50,25 @@ namespace Barotrauma.Networking
            LoadClientPermissions();
        }

-        private void WriteNetProperties(IWriteMessage outMsg)
+        private void WriteNetProperties(IWriteMessage outMsg, Client c)
        {
-            outMsg.Write((UInt16)netProperties.Keys.Count);
            foreach (UInt32 key in netProperties.Keys)
            {
-                outMsg.Write(key);
-                netProperties[key].Write(outMsg);
+                var property = netProperties[key];
+                property.SyncValue();
+                if (property.LastUpdateID > c.LastRecvLobbyUpdate)
+                {
+                    outMsg.Write(key);
+                    netProperties[key].Write(outMsg);
+                }
            }
+            outMsg.Write((UInt32)0);
        }

        public void ServerAdminWrite(IWriteMessage outMsg, Client c)
        {
            c.LastSentServerSettingsUpdate = LastPropertyUpdateId;
-            WriteNetProperties(outMsg);
+            WriteNetProperties(outMsg, c);
            WriteMonsterEnabled(outMsg);
            BanList.ServerAdminWrite(outMsg, c);
            Whitelist.ServerAdminWrite(outMsg, c);
@@ -79,8 +99,11 @@ namespace Barotrauma.Networking
            {
                WriteExtraCargo(outMsg);
            }
-            
-            WriteHiddenSubs(outMsg);
+
+            if (requiredFlags.HasFlag(NetFlags.HiddenSubs))
+            {
+                WriteHiddenSubs(outMsg);
+            }

            if (c.HasPermission(Networking.ClientPermissions.ManageSettings)
                && !NetIdUtils.IdMoreRecentOrMatches(c.LastRecvServerSettingsUpdate, LastPropertyUpdateId))
@@ -164,6 +187,7 @@ namespace Barotrauma.Networking
            {
                ReadHiddenSubs(incMsg);
                changed |= true;
+                UpdateFlag(NetFlags.HiddenSubs);
            }
            
            if (flags.HasFlag(NetFlags.Misc))
@@ -199,11 +223,6 @@ namespace Barotrauma.Networking
                    AutoRestart = autoRestart;
                }

-                RadiationEnabled = incMsg.ReadBoolean();
-
-                int maxMissionCount = MaxMissionCount + incMsg.ReadByte() - 1;
-                MaxMissionCount = MathHelper.Clamp(maxMissionCount, CampaignSettings.MinMissionCountLimit, CampaignSettings.MaxMissionCountLimit);
-
                changed |= true;
                UpdateFlag(NetFlags.Misc);
            }