Build 1.1.4.0

2023-03-31 18:40:44 +03:00
parent efba17e0ff
commit 9470edead3
483 changed files with 17487 additions and 8548 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($"Input contains duplicate packages (\"{cp.Name}\", hash: {cp.Hash?.ShortRepresentation ?? "none"})");
+                    }
                }
            }