Build 0.17.11.0

2022-04-19 23:52:59 +09:00
parent cfe0d6cbc3
commit d9a05400e0
14 changed files with 43 additions and 18 deletions
@@ -153,7 +153,10 @@ namespace Barotrauma
            {
                Name = TextManager.GetWithVariable("wreckeditemformat", "[name]", Name);
            }
-            Name = Name.Fallback(OriginalName);
+            if (!string.IsNullOrEmpty(OriginalName))
+            {
+                Name = Name.Fallback(OriginalName);
+            }

            var tags = new HashSet<Identifier>();
            string joinedTags = element.GetAttributeString("tags", "");
@@ -1229,6 +1229,7 @@ namespace Barotrauma
            {
                if (!connectedSubs.Contains(item.Submarine)) { continue; }
                if (!item.HasTag("cargocontainer")) { continue; }
+                if (item.NonInteractable || item.HiddenInGame) { continue; }
                var itemContainer = item.GetComponent<ItemContainer>();
                if (itemContainer == null) { continue; }
                int emptySlots = 0;