optimize vanilla asset load when the asset doesn't exist

Pathoschild · Pathoschild · commit 4b87801fc534 · 2023-12-09T14:35:19.000-05:00
diff --git a/src/SMAPI/Framework/ContentCoordinator.cs b/src/SMAPI/Framework/ContentCoordinator.cs
@@ -575,14 +575,19 @@ private bool TryLoadVanillaAsset<T>(string assetName, [NotNullWhen(true)] out T?
         {
             try
             {
-                asset = this.VanillaContentManager.Load<T>(assetName);
-                return true;
+                if (this.VanillaContentManager.DoesAssetExist<T>(assetName))
+                {
+                    asset = this.VanillaContentManager.Load<T>(assetName);
+                    return true;
+                }
             }
             catch
             {
-                asset = default;
-                return false;
+                // handled below
             }
+
+            asset = default;
+            return false;
         }
 
         /// <summary>Get the language enums (like <see cref="LocalizedContentManager.LanguageCode.ja"/>) indexed by locale code (like <c>ja-JP</c>).</summary>

Original file line number	Diff line number	Diff line change
`@@ -575,14 +575,19 @@ private bool TryLoadVanillaAsset<T>(string assetName, [NotNullWhen(true)] out T?`
`575`	`575`	`{`
`576`	`576`	`try`
`577`	`577`	`{`
`578`		`- asset = this.VanillaContentManager.Load<T>(assetName);`
`579`		`- return true;`
	`578`	`+ if (this.VanillaContentManager.DoesAssetExist<T>(assetName))`
	`579`	`+ {`
	`580`	`+ asset = this.VanillaContentManager.Load<T>(assetName);`
	`581`	`+ return true;`
	`582`	`+ }`
`580`	`583`	`}`
`581`	`584`	`catch`
`582`	`585`	`{`
`583`		`- asset = default;`
`584`		`- return false;`
	`586`	`+ // handled below`
`585`	`587`	`}`
	`588`	`+`
	`589`	`+ asset = default;`
	`590`	`+ return false;`
`586`	`591`	`}`
`587`	`592`
`588`	`593`	`/// <summary>Get the language enums (like <see cref="LocalizedContentManager.LanguageCode.ja"/>) indexed by locale code (like <c>ja-JP</c>).</summary>`