Release v0.15.12.0

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

@@ -11,6 +11,7 @@ namespace Barotrauma
 
         public override void ServerWriteInitial(IWriteMessage msg, Client c)
         {
+            base.ServerWriteInitial(msg, c);
             msg.Write((ushort)spawnedItems.Count);
             foreach (Item item in spawnedItems)
             {

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

@@ -0,0 +1,22 @@
+using Barotrauma.Networking;
+
+namespace Barotrauma
+{
+    partial class AlienRuinMission : Mission
+    {
+        public override void ServerWriteInitial(IWriteMessage msg, Client c)
+        {
+            base.ServerWriteInitial(msg, c);
+            msg.Write((ushort)existingTargets.Count);
+            foreach (var t in existingTargets)
+            {
+                msg.Write(t != null ? t.ID : Entity.NullEntityID);
+            }
+            msg.Write((ushort)spawnedTargets.Count);
+            foreach (var t in spawnedTargets)
+            {
+                t.WriteSpawnData(msg, t.ID, false);
+            }
+        }
+    }
+}

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

@@ -1,12 +0,0 @@
-using Barotrauma.Networking;
-
-namespace Barotrauma
-{
-    partial class BeaconMission : Mission
-    {
-        public override void ServerWriteInitial(IWriteMessage msg, Client c)
-        {
-            return;
-        }
-    }
-}

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

@@ -6,6 +6,7 @@ namespace Barotrauma
     {
         public override void ServerWriteInitial(IWriteMessage msg, Client c)
         {
+            base.ServerWriteInitial(msg, c);
             msg.Write((ushort)items.Count);
             foreach (Item item in items)
             {

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

@@ -83,10 +83,5 @@ namespace Barotrauma
                 }
             }
         }
-
-        public override void ServerWriteInitial(IWriteMessage msg, Client c)
-        {
-            //do nothing
-        }
     }
 }

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

@@ -9,6 +9,8 @@ namespace Barotrauma
     {
         public override void ServerWriteInitial(IWriteMessage msg, Client c)
         {
+            base.ServerWriteInitial(msg, c);
+
             if (characters.Count == 0)
             {
                 throw new InvalidOperationException("Server attempted to write escort mission data when no characters had been spawned.");

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

@@ -6,16 +6,17 @@ namespace Barotrauma
     {
         public override void ServerWriteInitial(IWriteMessage msg, Client c)
         {
+            base.ServerWriteInitial(msg, c);
             msg.Write((byte)caves.Count);
             foreach (var cave in caves)
             {
                 msg.Write((byte)(Level.Loaded == null || !Level.Loaded.Caves.Contains(cave) ? 255 : Level.Loaded.Caves.IndexOf(cave)));
             }
 
-            foreach (var kvp in SpawnedResources)
+            foreach (var kvp in spawnedResources)
             {
                 msg.Write((byte)kvp.Value.Count);
-                var rotation = ResourceClusters[kvp.Key].Second;
+                var rotation = resourceClusters[kvp.Key].rotation;
                 msg.Write(rotation);
                 foreach (var r in kvp.Value)
                 {
@@ -23,7 +24,7 @@ namespace Barotrauma
                 }
             }
 
-            foreach (var kvp in RelevantLevelResources)
+            foreach (var kvp in relevantLevelResources)
             {
                 msg.Write(kvp.Key);
                 msg.Write((byte)kvp.Value.Length);

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

@@ -16,6 +16,14 @@ namespace Barotrauma
             GameServer.Log(TextManager.Get("MissionInfo") + ": " + header + " - " + message, ServerLog.MessageType.ServerMessage);
         }
 
-        public abstract void ServerWriteInitial(IWriteMessage msg, Client c);
+        public virtual void ServerWriteInitial(IWriteMessage msg, Client c)
+        {
+            msg.Write((ushort)State);
+        }
+
+        public virtual void ServerWrite(IWriteMessage msg)
+        {
+            msg.Write((ushort)State);
+        }
     }
 }

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

@@ -7,6 +7,8 @@ namespace Barotrauma
     {
         public override void ServerWriteInitial(IWriteMessage msg, Client c)
         {
+            base.ServerWriteInitial(msg, c);
+
             if (monsters.Count == 0 && monsterPrefabs.Count > 0)
             {
                 throw new InvalidOperationException("Server attempted to write monster mission data when no monsters had been spawned.");

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

@@ -8,6 +8,7 @@ namespace Barotrauma
 
         public override void ServerWriteInitial(IWriteMessage msg, Client c)
         {
+            base.ServerWriteInitial(msg, c);
             msg.Write((byte)(selectedCave == null || Level.Loaded == null || !Level.Loaded.Caves.Contains(selectedCave) ? 255 : Level.Loaded.Caves.IndexOf(selectedCave)));
             msg.Write(nestPosition.X);
             msg.Write(nestPosition.Y);

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

@@ -9,6 +9,8 @@ namespace Barotrauma
     {
         public override void ServerWriteInitial(IWriteMessage msg, Client c)
         {
+            base.ServerWriteInitial(msg, c);
+
             // duplicate code from escortmission, should possibly be combined, though additional loot items might be added so maybe not
             if (characters.Count == 0)
             {

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

@@ -15,6 +15,8 @@ namespace Barotrauma
 
         public override void ServerWriteInitial(IWriteMessage msg, Client c)
         {
+            base.ServerWriteInitial(msg, c);
+
             msg.Write(usedExistingItem);
             if (usedExistingItem)
             {

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

@@ -0,0 +1,37 @@
+using Barotrauma.Networking;
+
+namespace Barotrauma
+{
+    partial class ScanMission : Mission
+    {
+        public override void ServerWriteInitial(IWriteMessage msg, Client c)
+        {
+            base.ServerWriteInitial(msg, c);
+            msg.Write((ushort)startingItems.Count);
+            foreach (var item in startingItems)
+            {
+                item.WriteSpawnData(msg,
+                    item.ID,
+                    parentInventoryIDs.ContainsKey(item) ? parentInventoryIDs[item] : Entity.NullEntityID,
+                    parentItemContainerIndices.ContainsKey(item) ? parentItemContainerIndices[item] : (byte)0);
+            }
+            ServerWriteScanTargetStatus(msg);
+        }
+
+        public override void ServerWrite(IWriteMessage msg)
+        {
+            base.ServerWrite(msg);
+            ServerWriteScanTargetStatus(msg);
+        }
+
+        private void ServerWriteScanTargetStatus(IWriteMessage msg)
+        {
+            msg.Write((byte)scanTargets.Count);
+            foreach (var kvp in scanTargets)
+            {
+                msg.Write(kvp.Key != null ? kvp.Key.ID : Entity.NullEntityID);
+                msg.Write(kvp.Value);
+            }
+        }
+    }
+}