Unstable v0.1100.0.4 (November 11th 2020)

2020-11-06 20:12:15 +02:00
parent 6b36bf809d
commit b772654326
297 changed files with 12502 additions and 4277 deletions
@@ -763,7 +763,7 @@ namespace Barotrauma.Items.Components
            }
        }

-        public virtual void Load(XElement componentElement, bool usePrefabValues)
+        public virtual void Load(XElement componentElement, bool usePrefabValues, IdRemap idRemap)
        {
            if (componentElement != null) 
            { 
@@ -1011,6 +1011,7 @@ namespace Barotrauma.Items.Components
                        if (FindSuitableContainer(character,
                            i =>
                            {
+                                if (i.IsThisOrAnyContainerIgnoredByAI()) { return 0; }
                                var container = i.GetComponent<ItemContainer>();
                                if (container == null) { return 0; }
                                if (container.Inventory.IsFull()) { return 0; }