Merge https://github.com/Regalis11/Barotrauma

2022-10-20 12:14:02 -03:00
parent 032572de52 a6ee9eadf3
commit 599db6be5e
63 changed files with 579 additions and 339 deletions
@@ -57,7 +57,7 @@ namespace Barotrauma
                {
                    Option<ContentPackageId> ugcId = ContentPackageId.Parse(otherModName.Value);
                    ContentPackage? otherMod =
-                        allPackages.FirstOrDefault(p => ugcId == p.UgcId)
+                        allPackages.FirstOrDefault(p => ugcId.IsSome() && ugcId == p.UgcId)
                        ?? allPackages.FirstOrDefault(p => p.Name == otherModName)
                        ?? allPackages.FirstOrDefault(p => p.NameMatches(otherModName))
                        ?? throw new MissingContentPackageException(ContentPackage, otherModName.Value);