From 55eec58eafb9ba07f3e8b0a1c8394cb114de17a0 Mon Sep 17 00:00:00 2001 From: Tyler Date: Wed, 19 Oct 2022 10:21:19 -0500 Subject: simplify ContentPackFor validation check --- src/SMAPI.Toolkit/Serialization/Models/Manifest.cs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/SMAPI.Toolkit') diff --git a/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs b/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs index 4f84a60d..1607cf3e 100644 --- a/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs +++ b/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs @@ -134,15 +134,11 @@ namespace StardewModdingAPI.Toolkit.Serialization.Models return false; } - // validate content pack - else if (isContentPack) + // validate content pack ID + else if (isContentPack && string.IsNullOrWhiteSpace(this.ContentPackFor!.UniqueID)) { - // invalid content pack ID - if (string.IsNullOrWhiteSpace(this.ContentPackFor!.UniqueID)) - { - error = $"manifest declares {nameof(IManifest.ContentPackFor)} without its required {nameof(IManifestContentPackFor.UniqueID)} field."; - return false; - } + error = $"manifest declares {nameof(IManifest.ContentPackFor)} without its required {nameof(IManifestContentPackFor.UniqueID)} field."; + return false; } // validate required fields -- cgit