(cb3078117) Merged hulls to fix speech issue

2019-05-16 06:46:30 +03:00
parent 10d219f935
commit 75b9ea6cce
31 changed files with 550 additions and 179 deletions
@@ -1114,8 +1114,10 @@ namespace Barotrauma

            //----------------------------------------

-            var itemPrefab = MapEntityPrefab.Find(itemName, itemIdentifier) as ItemPrefab;
-            if (itemPrefab == null) return null;
+            var itemPrefab = string.IsNullOrEmpty(itemIdentifier) ?
+                MapEntityPrefab.Find(itemName, null, showErrorMessages: false) as ItemPrefab :
+                MapEntityPrefab.Find(itemName, itemIdentifier, showErrorMessages: false) as ItemPrefab;
+            if (itemPrefab == null) { return null; }

            Inventory inventory = null;