Build 0.20.4.0

Barotrauma/BarotraumaServer/ServerSource/Characters/CharacterNetworking.cs

@@ -269,10 +269,13 @@ namespace Barotrauma
                 case EventType.UpdateTalents:
                     if (c.Character != this)
                     {
+                        if (!IsBot || !c.HasPermission(ClientPermissions.ManageBotTalents))
+                        {
 #if DEBUG
-                        DebugConsole.Log("Received a character update message from a client who's not controlling the character");
+                            DebugConsole.Log("Received a character update message from a client who's not controlling the character");
 #endif
-                        return;
+                            return;
+                        }
                     }
 
                     // get the full list of talents from the player, only give the ones

Barotrauma/BarotraumaServer/ServerSource/Events/EventManager.cs

@@ -31,7 +31,7 @@ namespace Barotrauma
                     if (convAction.SelectedOption > -1)
                     {
                         //someone else already chose an option for this conversation: interrupt for this client
-                        convAction.ServerWrite(convAction.speaker, sender, interrupt: true);
+                        convAction.ServerWrite(convAction.Speaker, sender, interrupt: true);
                     }
                     else
                     {

Barotrauma/BarotraumaServer/ServerSource/GameSession/MedicalClinic.cs

@@ -2,7 +2,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
+using Barotrauma.Extensions;
 using Barotrauma.Networking;
 
 namespace Barotrauma
@@ -30,6 +32,9 @@ namespace Barotrauma
 
             switch (header)
             {
+                case NetworkHeader.ADD_EVERYTHING_TO_PENDING:
+                    ProcessAddEverything(sender);
+                    break;
                 case NetworkHeader.REQUEST_AFFLICTIONS:
                     ProcessRequestedAfflictions(inc, sender);
                     break;
@@ -57,7 +62,14 @@ namespace Barotrauma
 
             NetCrewMember newCrewMember = INetSerializableStruct.Read<NetCrewMember>(inc);
             InsertPendingCrewMember(newCrewMember);
-            ServerSend(newCrewMember, NetworkHeader.ADD_PENDING, DeliveryMethod.Reliable, reponseClient: client);
+            ServerSend(new NetCollection<NetCrewMember>(newCrewMember), NetworkHeader.ADD_PENDING, DeliveryMethod.Reliable, reponseClient: client);
+        }
+
+        private void ProcessAddEverything(Client client)
+        {
+            if (CheckRateLimit(client) == RateLimitResult.LimitReached) { return; }
+            AddEverythingToPending();
+            ServerSend(PendingHeals.ToNetCollection(), NetworkHeader.ADD_PENDING, DeliveryMethod.Reliable, reponseClient: client);
         }
 
         private void ProcessNewRemoval(IReadMessage inc, Client client)
@@ -73,12 +85,7 @@ namespace Barotrauma
         {
             if (CheckRateLimit(client) == RateLimitResult.LimitReached) { return; }
 
-            INetSerializableStruct writeCrewMember = new NetPendingCrew
-            {
-                CrewMembers = PendingHeals.ToArray()
-            };
-
-            ServerSend(writeCrewMember, NetworkHeader.REQUEST_PENDING, DeliveryMethod.Reliable, targetClient: client);
+            ServerSend(PendingHeals.ToNetCollection(), NetworkHeader.REQUEST_PENDING, DeliveryMethod.Reliable, targetClient: client);
         }
 
         private void ProcessHealing(Client client)
@@ -107,10 +114,10 @@ namespace Barotrauma
 
             CharacterInfo? foundInfo = crewMember.FindCharacterInfo(GetCrewCharacters());
 
-            NetAffliction[] pendingAfflictions = Array.Empty<NetAffliction>();
+            ImmutableArray<NetAffliction> pendingAfflictions = ImmutableArray<NetAffliction>.Empty;
             int infoId = 0;
 
-            if (foundInfo is { Character: { CharacterHealth: { } health } })
+            if (foundInfo is { Character.CharacterHealth: { } health })
             {
                 pendingAfflictions = GetAllAfflictions(health);
                 infoId = foundInfo.GetIdentifierUsingOriginalName();

Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs

@@ -2516,6 +2516,7 @@ namespace Barotrauma.Networking
             msg.WriteInt32(ServerSettings.MaximumMoneyTransferRequest);
             msg.WriteBoolean(IsUsingRespawnShuttle());
             msg.WriteByte((byte)ServerSettings.LosMode);
+            msg.WriteByte((byte)ServerSettings.ShowEnemyHealthBars);
             msg.WriteBoolean(includesFinalize); msg.WritePadBits();
 
             ServerSettings.WriteMonsterEnabled(msg);

Barotrauma/BarotraumaServer/ServerSource/Networking/ServerSettings.cs

@@ -272,7 +272,6 @@ namespace Barotrauma.Networking
             XDocument doc = new XDocument(new XElement("serversettings"));
 
             doc.Root.SetAttributeValue("name", ServerName);
-            doc.Root.SetAttributeValue("public", IsPublic);
             doc.Root.SetAttributeValue("port", Port);
 #if USE_STEAM
             doc.Root.SetAttributeValue("queryport", QueryPort);