(965c31410a) Unstable v0.10.4.0

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

@@ -10,8 +10,9 @@ namespace Barotrauma
             foreach (Item item in items)
             {
                 item.WriteSpawnData(msg, 
-                    itemIDs[item], 
-                    parentInventoryIDs.ContainsKey(item) ? parentInventoryIDs[item] : Entity.NullEntityID);
+                    item.OriginalID, 
+                    parentInventoryIDs.ContainsKey(item) ? parentInventoryIDs[item] : Entity.NullEntityID,
+                    parentItemContainerIndices.ContainsKey(item) ? parentItemContainerIndices[item] : (byte)0);
             }
         }
     }

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

@@ -7,7 +7,7 @@ namespace Barotrauma
     {
         public override void ServerWriteInitial(IWriteMessage msg, Client c)
         {
-            if (monsters.Count == 0 && monsterFiles.Count > 0)
+            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/SalvageMission.cs

@@ -8,8 +8,8 @@ namespace Barotrauma
     {
         private bool usedExistingItem;
 
-        private UInt16 originalItemID;
         private UInt16 originalInventoryID;
+        private byte originalItemContainerIndex;
 
         private readonly List<Pair<int, int>> executedEffectIndices = new List<Pair<int, int>>();
 
@@ -18,11 +18,11 @@ namespace Barotrauma
             msg.Write(usedExistingItem);
             if (usedExistingItem)
             {
-                msg.Write(originalItemID);
+                msg.Write(item.OriginalID);
             }
             else
             {
-                item.WriteSpawnData(msg, originalItemID, originalInventoryID);
+                item.WriteSpawnData(msg, item.OriginalID, originalInventoryID, originalItemContainerIndex);
             }
 
             msg.Write((byte)executedEffectIndices.Count);