Build 0.18.5.0

Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemContainer.cs

@@ -187,7 +187,7 @@ namespace Barotrauma.Items.Components
         [Serialize(false, IsPropertySaveable.No)]
         public bool RemoveContainedItemsOnDeconstruct { get; set; }
 
-        private readonly ImmutableArray<SlotRestrictions> slotRestrictions;
+        private ImmutableArray<SlotRestrictions> slotRestrictions;
 
         readonly List<ISerializableEntity> targets = new List<ISerializableEntity>();
 
@@ -215,13 +215,21 @@ namespace Barotrauma.Items.Components
 
         public override bool RecreateGUIOnResolutionChange => true;
 
-        public List<RelatedItem> ContainableItems { get; }
+        public List<RelatedItem> ContainableItems { get; private set; }
 
         public ItemContainer(Item item, ContentXElement element)
             : base(item, element)
+        {
+            LoadContainableRestrictions(element);
+            InitProjSpecific(element);
+        }
+
+        public void LoadContainableRestrictions(ContentXElement element)
         {
             int totalCapacity = capacity;
 
+            ContainableItems?.Clear();
+
             foreach (var subElement in element.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
@@ -242,7 +250,7 @@ namespace Barotrauma.Items.Components
                 }
             }
             Inventory = new ItemInventory(item, this, totalCapacity, SlotsPerRow);
-           
+
             List<SlotRestrictions> newSlotRestrictions = new List<SlotRestrictions>(totalCapacity);
             for (int i = 0; i < capacity; i++)
             {
@@ -253,7 +261,7 @@ namespace Barotrauma.Items.Components
             foreach (var subElement in element.Elements())
             {
                 if (subElement.Name.ToString().ToLowerInvariant() != "subcontainer") { continue; }
-       
+
                 int subCapacity = subElement.GetAttributeInt("capacity", 1);
                 int subMaxStackSize = subElement.GetAttributeInt("maxstacksize", maxStackSize);
 
@@ -281,7 +289,6 @@ namespace Barotrauma.Items.Components
             capacity = totalCapacity;
             slotRestrictions = newSlotRestrictions.ToImmutableArray();
             System.Diagnostics.Debug.Assert(totalCapacity == slotRestrictions.Length);
-            InitProjSpecific(element);
         }
 
         public int GetMaxStackSize(int slotIndex)