Unstable 0.1500.7.0 (No edition)

2021-10-14 00:42:06 +09:00
parent c8943ef9c4
commit de917c5d74
105 changed files with 871 additions and 443 deletions
@@ -32,7 +32,10 @@ namespace Barotrauma
                { typeof(Rectangle), (str, defVal) => ParseRect(str, true) }
            }.ToImmutableDictionary();
        
-        public static string ParseContentPathFromUri(this XObject element) => System.IO.Path.GetRelativePath(Environment.CurrentDirectory, element.BaseUri);
+        public static string ParseContentPathFromUri(this XObject element)
+            => !string.IsNullOrWhiteSpace(element.BaseUri)
+                ? System.IO.Path.GetRelativePath(Environment.CurrentDirectory, element.BaseUri.CleanUpPath())
+                : "";

        public static readonly XmlReaderSettings ReaderSettings = new XmlReaderSettings
        {