Unstable 0.17.10.0

2022-04-14 23:50:49 +09:00
parent 72328c29cb
commit cfe0d6cbc3
43 changed files with 624 additions and 723 deletions
@@ -75,7 +75,8 @@ namespace Barotrauma
        public class RequiredItemByIdentifier : RequiredItem
        {
            public readonly Identifier ItemPrefabIdentifier;
-            public ItemPrefab ItemPrefab => ItemPrefab.Prefabs[ItemPrefabIdentifier];
+            public ItemPrefab ItemPrefab => ItemPrefab.Prefabs.TryGet(ItemPrefabIdentifier, out var prefab) ? prefab
+                : MapEntityPrefab.FindByName(ItemPrefabIdentifier.Value) as ItemPrefab ?? throw new Exception($"No ItemPrefab with identifier or name \"{ItemPrefabIdentifier}\"");
            public override UInt32 UintIdentifier { get; }

            public override IEnumerable<ItemPrefab> ItemPrefabs => ItemPrefab.ToEnumerable();