v0.12.0.2

2021-02-10 17:08:21 +02:00
parent 5c80a59bdd
commit 694cdfee7b
353 changed files with 12897 additions and 5028 deletions
@@ -249,10 +249,6 @@ namespace Barotrauma
        {
            get { return ""; }
        }
-
-        private bool ignoreByAI;
-        public bool IgnoreByAI => ignoreByAI;
-        public void SetIgnoreByAI(bool ignore) => ignoreByAI = ignore;
        
        public MapEntity(MapEntityPrefab prefab, Submarine submarine, ushort id) : base(submarine, id)
        {
@@ -624,6 +620,21 @@ namespace Barotrauma
                    continue;
                }

+                if (t == typeof(Structure))
+                {
+                    string name = element.Attribute("name").Value;
+                    string identifier = element.GetAttributeString("identifier", "");
+                    StructurePrefab structurePrefab = Structure.FindPrefab(name, identifier);
+                    if (structurePrefab == null)
+                    {
+                        ItemPrefab itemPrefab = ItemPrefab.Find(name, identifier);
+                        if (itemPrefab != null)
+                        {
+                            t = typeof(Item);
+                        }
+                    }
+                }
+
                try
                {
                    MethodInfo loadMethod = t.GetMethod("Load", new[] { typeof(XElement), typeof(Submarine), typeof(IdRemap) });