Reapply "OBT1.1.0 Merge branch 'dev_pte' into dev"

This reverts commit 046483b9da.
2026-04-30 21:59:54 +08:00
parent 02689d0d86
commit 25683dcf39
85 changed files with 2413 additions and 779 deletions
@@ -1,4 +1,4 @@
-using System.Xml.Linq;
+using System.Xml.Linq;

 namespace Barotrauma
 {
@@ -21,7 +21,7 @@ namespace Barotrauma
            var npcConversationCollection = new NPCConversationCollection(this, mainElement);
            if (!NPCConversationCollection.Collections.ContainsKey(npcConversationCollection.Language))
            {
-                NPCConversationCollection.Collections.Add(npcConversationCollection.Language, new PrefabCollection<NPCConversationCollection>());
+                NPCConversationCollection.Collections.TryAdd(npcConversationCollection.Language, new PrefabCollection<NPCConversationCollection>());
            }
            NPCConversationCollection.Collections[npcConversationCollection.Language].Add(npcConversationCollection, allowOverriding);
        }
@@ -42,4 +42,4 @@ namespace Barotrauma
            }
        }
    }
-}
+}