OBT/1.2.0(Spring Update)

Sync with Upstream
2026-04-25 13:25:41 +08:00
parent 5207b381b7
commit 59bc21973a
421 changed files with 24090 additions and 11391 deletions
@@ -99,12 +99,13 @@ namespace Barotrauma
        public static ContentPath FromRaw(ContentPackage? contentPackage, string? rawValue)
        {
            var newRaw = new ContentPath(contentPackage, rawValue);
-            if (prevCreatedRaw is not null && prevCreatedRaw.ContentPackage == contentPackage &&
+            // Removed as this almost never happens but makes the constructor not thread-safe.
+            /*if (prevCreatedRaw is not null && prevCreatedRaw.ContentPackage == contentPackage &&
                prevCreatedRaw.RawValue == rawValue)
            {
                newRaw.cachedValue = prevCreatedRaw.Value;
            }
-            prevCreatedRaw = newRaw;
+            prevCreatedRaw = newRaw;*/
            return newRaw;
        }
        
@@ -158,4 +159,4 @@ namespace Barotrauma
        
        public override string? ToString() => Value;
    }
-}
+}