Unstable 0.1400.1.0

Barotrauma/BarotraumaServer/ServerSource/Events/EventActions/ConversationAction.cs

@@ -1,5 +1,7 @@
 using Barotrauma.Networking;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Barotrauma
 {
@@ -15,9 +17,45 @@ namespace Barotrauma
         private static readonly Dictionary<Client, ConversationAction> lastActiveAction = new Dictionary<Client, ConversationAction>();
 
         private readonly HashSet<Client> targetClients = new HashSet<Client>();
+        private readonly Dictionary<Client, DateTime> ignoredClients = new Dictionary<Client, DateTime>();
+
         public IEnumerable<Client> TargetClients
         {
-            get { return targetClients; }
+            get
+            {
+                UpdateIgnoredClients();
+                return targetClients.Where(c => !ignoredClients.ContainsKey(c));
+            }
+        }
+
+        private void UpdateIgnoredClients()
+        {
+            if (ignoredClients.Any())
+            {
+                HashSet<Client> clientsToRemove = null;
+                foreach (var k in ignoredClients.Keys)
+                {
+                    if (ignoredClients[k] < DateTime.Now)
+                    {
+                        clientsToRemove ??= new HashSet<Client>();
+                        clientsToRemove.Add(k);
+                    }
+                }
+                if (!(clientsToRemove is null))
+                {
+                    foreach (var k in clientsToRemove)
+                    {
+                        ignoredClients.Remove(k);
+                    }
+                }
+            }
+        }
+
+        public void IgnoreClient(Client c, float seconds)
+        {
+            if (!ignoredClients.ContainsKey(c)) { ignoredClients.Add(c, DateTime.Now); }
+            ignoredClients[c] = DateTime.Now + TimeSpan.FromSeconds(seconds);
+            Reset();
         }
 
         private bool IsBlockedByAnotherConversation(IEnumerable<Entity> targets)

Barotrauma/BarotraumaServer/ServerSource/Events/EventManager.cs

@@ -28,7 +28,14 @@ namespace Barotrauma
                         continue;
                     }
                     
-                    convAction.SelectedOption = selectedOption;
+                    if (selectedOption == byte.MaxValue)
+                    {
+                        convAction.IgnoreClient(sender, 3f);
+                    }
+                    else
+                    {
+                        convAction.SelectedOption = selectedOption;
+                    }
                     return;                    
                 }                
             }

Barotrauma/BarotraumaServer/ServerSource/Events/Missions/AbandonedOutpostMission.cs

@@ -1,16 +1,20 @@
 using Barotrauma.Networking;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace Barotrauma
 {
     partial class AbandonedOutpostMission : Mission
     {
+        private readonly List<Item> spawnedItems = new List<Item>();
+
         public override void ServerWriteInitial(IWriteMessage msg, Client c)
         {
-            if (characters.Count == 0)
+            msg.Write((ushort)spawnedItems.Count);
+            foreach (Item item in spawnedItems)
             {
-                throw new InvalidOperationException("Server attempted to write AbandonedOutpostMission data when no characters had been spawned.");
+                item.WriteSpawnData(msg, item.ID, Entity.NullEntityID, 0);
             }
 
             msg.Write((byte)characters.Count);

Barotrauma/BarotraumaServer/ServerSource/Events/Missions/CombatMission.cs

@@ -21,7 +21,7 @@ namespace Barotrauma
             }
         }
 
-        public override void Update(float deltaTime)
+        protected override void UpdateMissionSpecific(float deltaTime)
         {
             if (!initialized)
             {

Barotrauma/BarotraumaServer/ServerSource/Events/Missions/EscortMission.cs

@@ -18,6 +18,7 @@ namespace Barotrauma
             foreach (Character character in characters)
             {
                 character.WriteSpawnData(msg, character.ID, restrictMessageSize: false);
+                msg.Write(terroristCharacters.Contains(character));
                 List<Item> characterItems = characterDictionary[character];
                 // items must be written in a specific sequence so that child items aren't written before their parents
                 msg.Write((ushort)characterItems.Count());

Barotrauma/BarotraumaServer/ServerSource/Events/Missions/Mission.cs

@@ -6,10 +6,12 @@ namespace Barotrauma
     {
         partial void ShowMessageProjSpecific(int missionState)
         {
-            if (missionState >= Headers.Count && missionState >= Messages.Count) return;
+            int messageIndex = missionState - 1;
+            if (messageIndex >= Headers.Count && messageIndex >= Messages.Count) { return; }
+            if (messageIndex < 0) { return; }
 
-            string header = missionState < Headers.Count ? Headers[missionState] : "";
-            string message = missionState < Messages.Count ? Messages[missionState] : "";
+            string header = messageIndex < Headers.Count ? Headers[messageIndex] : "";
+            string message = messageIndex < Messages.Count ? Messages[messageIndex] : "";
 
             GameServer.Log(TextManager.Get("MissionInfo") + ": " + header + " - " + message, ServerLog.MessageType.ServerMessage);
         }

Barotrauma/BarotraumaServer/ServerSource/Events/Missions/OutpostDestroyMission.cs

@@ -1,19 +0,0 @@
-using Barotrauma.Networking;
-using System.Collections.Generic;
-
-namespace Barotrauma
-{
-    partial class OutpostDestroyMission : AbandonedOutpostMission
-    {
-        private readonly List<Item> spawnedItems = new List<Item>();
-        public override void ServerWriteInitial(IWriteMessage msg, Client c)
-        {
-            base.ServerWriteInitial(msg, c);
-            msg.Write((ushort)spawnedItems.Count);
-            foreach (Item item in spawnedItems)
-            {
-                item.WriteSpawnData(msg, item.ID, Entity.NullEntityID, 0);
-            }
-        }
-    }
-}