Merge https://github.com/Regalis11/Barotrauma into develop

2023-05-11 11:22:12 -03:00
parent 9f84941792 8a89b18a63
commit 09c36a9213
13 changed files with 28 additions and 18 deletions
@@ -3560,6 +3560,7 @@ namespace Barotrauma
                foreach (var subElement in info.SubmarineElement.Elements())
                {
                    int id = subElement.GetAttributeInt("ID", -1);
+                    if (id == -1) { continue; }
                    Identifier identifier = subElement.GetAttributeIdentifier("identifier", string.Empty);
                    if (entities.TryGetValue(id, out Identifier duplicateEntity))
                    {