(6eeea9b7c) v0.9.10.0.0

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/CargoMission.cs

@@ -1,4 +1,5 @@
 using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
@@ -10,6 +11,8 @@ namespace Barotrauma
         private readonly XElement itemConfig;
 
         private readonly List<Item> items = new List<Item>();
+        private readonly Dictionary<Item, UInt16> itemIDs = new Dictionary<Item, UInt16>();
+        private readonly Dictionary<Item, UInt16> parentInventoryIDs = new Dictionary<Item, UInt16>();
 
         private int requiredDeliveryAmount;
 
@@ -22,8 +25,6 @@ namespace Barotrauma
 
         private void InitItems()
         {
-            items.Clear();
-
             if (itemConfig == null)
             {
                 DebugConsole.ThrowError("Failed to initialize items for cargo mission (itemConfig == null)");
@@ -91,8 +92,13 @@ namespace Barotrauma
             var item = new Item(itemPrefab, position, cargoRoom.Submarine);
             item.FindHull();
             items.Add(item);
-            
-            if (parent != null) parent.Combine(item, user: null);
+            itemIDs.Add(item, item.ID);
+
+            if (parent != null) 
+            {
+                parentInventoryIDs.Add(item, parent.ID);
+                parent.Combine(item, user: null); 
+            }
             
             foreach (XElement subElement in element.Elements())
             {
@@ -106,6 +112,10 @@ namespace Barotrauma
 
         public override void Start(Level level)
         {
+            items.Clear();
+            itemIDs.Clear();
+            parentInventoryIDs.Clear();
+
             if (!IsClient)
             {
                 InitItems();

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/CombatMission.cs

@@ -108,23 +108,6 @@ namespace Barotrauma
             subs[1].SetPosition(subs[1].FindSpawnPos(Level.Loaded.EndPosition));
             subs[1].FlipX();
 
-            //prevent wifi components from communicating between subs
-            List<WifiComponent> wifiComponents = new List<WifiComponent>();
-            foreach (Item item in Item.ItemList)
-            {
-                wifiComponents.AddRange(item.GetComponents<WifiComponent>());
-            }
-            foreach (WifiComponent wifiComponent in wifiComponents)
-            {
-                for (int i = 0; i < 2; i++)
-                {
-                    if (wifiComponent.Item.Submarine == subs[i] || subs[i].ConnectedDockingPorts.ContainsKey(wifiComponent.Item.Submarine))
-                    {
-                        wifiComponent.TeamID = subs[i].TeamID;
-                    }
-                }
-            }
-
             crews = new List<Character>[] { new List<Character>(), new List<Character>() };
 
             foreach (Submarine submarine in Submarine.Loaded)

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/MonsterMission.cs

@@ -70,7 +70,7 @@ namespace Barotrauma
                 monsterFiles.Add(new Tuple<string, Point>(monster, new Point(min, max)));
             }
             description = description.Replace("[monster]",
-                TextManager.Get("character." + System.IO.Path.GetFileNameWithoutExtension(monsterFileName)));
+                TextManager.Get("character." + Barotrauma.IO.Path.GetFileNameWithoutExtension(monsterFileName)));
         }
         
         public override void Start(Level level)

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/SalvageMission.cs

@@ -103,6 +103,10 @@ namespace Barotrauma
 
         public override void Start(Level level)
         {
+#if SERVER
+            originalItemID = Entity.NullEntityID;
+            originalInventoryID = Entity.NullEntityID;
+#endif
             if (!IsClient)
             {
                 //ruin/wreck items are allowed to spawn close to the sub
@@ -147,6 +151,9 @@ namespace Barotrauma
                     item.body.FarseerBody.BodyType = BodyType.Kinematic;
                     item.FindHull();
                 }
+#if SERVER
+                originalItemID = item.ID;
+#endif
 
                 for (int i = 0; i < statusEffects.Count; i++)
                 {
@@ -166,6 +173,7 @@ namespace Barotrauma
                     foreach (Item it in Item.ItemList)
                     {
                         if (!it.HasTag(containerTag)) { continue; }
+                        if (it.NonInteractable) { continue; }
                         switch (spawnPositionType)
                         {
                             case Level.PositionType.Cave:
@@ -181,7 +189,13 @@ namespace Barotrauma
                         }
                         var itemContainer = it.GetComponent<Items.Components.ItemContainer>();
                         if (itemContainer == null) { continue; }
-                        if (itemContainer.Combine(item, user: null)) { break; } // Placement successful
+                        if (itemContainer.Combine(item, user: null)) 
+                        {
+#if SERVER
+                            originalInventoryID = it.ID;
+#endif
+                            break; 
+                        } // Placement successful
                     }
                 }
             }