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

2023-05-10 11:55:46 -03:00
parent 768a1f309c 235d42b34f
commit 2c45c3d020
273 changed files with 5739 additions and 2421 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"})");
+                    }
                }
            }