From 16f986c51b9c87c2253a39fd771dcc24f7c43db4 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 14 Dec 2019 21:31:34 -0500
Subject: refactor cache invalidation & propagation to allow for future
 optimizations

---
 src/SMAPI/Framework/Content/ContentCache.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/SMAPI/Framework/Content')

diff --git a/src/SMAPI/Framework/Content/ContentCache.cs b/src/SMAPI/Framework/Content/ContentCache.cs
index c252b7b6..f33ff84d 100644
--- a/src/SMAPI/Framework/Content/ContentCache.cs
+++ b/src/SMAPI/Framework/Content/ContentCache.cs
@@ -119,13 +119,12 @@ namespace StardewModdingAPI.Framework.Content
         /// <param name="predicate">Matches the asset keys to invalidate.</param>
         /// <param name="dispose">Whether to dispose invalidated assets. This should only be <c>true</c> when they're being invalidated as part of a dispose, to avoid crashing the game.</param>
         /// <returns>Returns the removed keys (if any).</returns>
-        public IEnumerable<string> Remove(Func<string, Type, bool> predicate, bool dispose)
+        public IEnumerable<string> Remove(Func<string, object, bool> predicate, bool dispose)
         {
             List<string> removed = new List<string>();
             foreach (string key in this.Cache.Keys.ToArray())
             {
-                Type type = this.Cache[key].GetType();
-                if (predicate(key, type))
+                if (predicate(key, this.Cache[key]))
                 {
                     this.Remove(key, dispose);
                     removed.Add(key);
-- 
cgit