(1fe9abf75) Fix the GetAdjacentHulls method.

Barotrauma/BarotraumaShared/Source/Items/Item.cs

@@ -1939,7 +1939,6 @@ namespace Barotrauma
             return Load(element, submarine, createNetworkEvent: false);
         }
 
-
         /// <summary>
         /// Instantiate a new item and load its data from the XML element.
         /// </summary>
@@ -1952,10 +1951,30 @@ namespace Barotrauma
             string name = element.Attribute("name").Value;            
             string identifier = element.GetAttributeString("identifier", "");
 
-            ItemPrefab prefab = ItemPrefab.Find(name, identifier);
+            ItemPrefab prefab;
+            if (string.IsNullOrEmpty(identifier))
+            {
+                //legacy support: 
+                //1. attempt to find a prefab with an empty identifier and a matching name
+                prefab = MapEntityPrefab.Find(name, "", showErrorMessages: false) as ItemPrefab;
+                //2. not found, attempt to find a prefab with a matching name
+                if (prefab == null) prefab = MapEntityPrefab.Find(name) as ItemPrefab;
+            }
+            else
+            {
+                prefab = MapEntityPrefab.Find(null, identifier, showErrorMessages: false) as ItemPrefab;
+
+                //not found, see if we can find a prefab with a matching alias
+                if (prefab == null)
+                {
+                    string lowerCaseName = name.ToLowerInvariant();
+                    prefab = MapEntityPrefab.List.Find(me => me.Aliases != null && me.Aliases.Contains(lowerCaseName)) as ItemPrefab;
+                }
+            }
 
             if (prefab == null)
             {
+                DebugConsole.ThrowError("Error loading item - item prefab \"" + name + "\" (identifier \"" + identifier + "\") not found.");
                 return null;
             }