v1.0.13.1 (first post-1.0 patch)

2023-05-10 15:07:17 +03:00
parent 96fb49ba14
commit ee1db852b1
272 changed files with 5738 additions and 2413 deletions
@@ -116,9 +116,12 @@ namespace Barotrauma
            public static void ThrowIfDuplicates(IEnumerable<ContentPackage> pkgs)
            {
                var contentPackages = pkgs as IList<ContentPackage> ?? pkgs.ToArray();
-                if (contentPackages.Any(p1 => contentPackages.AtLeast(2, p2 => p1 == p2)))
+                foreach (ContentPackage cp in contentPackages)
                {
-                    throw new InvalidOperationException($"Input contains duplicate packages");
+                    if (contentPackages.AtLeast(2, cp2 => cp == cp2))
+                    {
+                        throw new InvalidOperationException($"There are duplicates in the list of selected content packages (\"{cp.Name}\", hash: {cp.Hash?.ShortRepresentation ?? "none"})");
+                    }
                }
            }