Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git

2022-06-15 13:26:49 -03:00
parent efd1243754 08cc2faec8
commit 7a09711296
410 changed files with 11140 additions and 5815 deletions
@@ -430,9 +430,9 @@ namespace Barotrauma
        public static void LoadVanillaFileList()
        {
            VanillaCorePackage = new CorePackage(XDocument.Load(VanillaFileList), VanillaFileList);
-            foreach ((string error, string? stackTrace) in VanillaCorePackage.Errors)
+            foreach (ContentFile.LoadError error in VanillaCorePackage.Errors)
            {
-                DebugConsole.ThrowError(error + (stackTrace == null ? string.Empty : '\n' + stackTrace));
+                DebugConsole.ThrowError(error.ToString());
            }
        }