diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2019-11-18 21:07:52 -0500 | 
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2019-11-18 21:07:52 -0500 | 
| commit | f154c5774d6e6197d63ca284606ce965a920d212 (patch) | |
| tree | 1c742e2f5fd457a55a6183f2fa05408bcfbbedb0 | |
| parent | 3d4276707b1599479aa618a9447e2e2d4abb8647 (diff) | |
| download | SMAPI-f154c5774d6e6197d63ca284606ce965a920d212.tar.gz SMAPI-f154c5774d6e6197d63ca284606ce965a920d212.tar.bz2 SMAPI-f154c5774d6e6197d63ca284606ce965a920d212.zip | |
minor updates (#638)
| -rw-r--r-- | src/SMAPI/Framework/SCore.cs | 8 | ||||
| -rw-r--r-- | src/SMAPI/Metadata/CoreAssetPropagator.cs | 2 | 
2 files changed, 1 insertions, 9 deletions
| diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs index 77b17c8a..afb82679 100644 --- a/src/SMAPI/Framework/SCore.cs +++ b/src/SMAPI/Framework/SCore.cs @@ -96,12 +96,6 @@ namespace StardewModdingAPI.Framework              new Regex(@"^DebugOutput:\s+(?:added CLOUD|added cricket|dismount tile|Ping|playerPos)", RegexOptions.Compiled | RegexOptions.CultureInvariant)          }; -        /// <summary>Regex patterns which match console error messages to suppress from the console and log.</summary> -        private readonly Regex[] SuppressConsoleErrorPatterns = -        { -            new Regex(@"^Error loading schedule data for (?:Bouncer|Dwarf|Gunther|Henchman|Krobus|Marlon|Mister Qi|Sandy|Wizard): .+ ---> System\.IO\.FileNotFoundException", RegexOptions.Compiled | RegexOptions.CultureInvariant) -        }; -          /// <summary>Regex patterns which match console messages to show a more friendly error for.</summary>          private readonly Tuple<Regex, string, LogLevel>[] ReplaceConsolePatterns =          { @@ -1321,8 +1315,6 @@ namespace StardewModdingAPI.Framework              // ignore suppressed message              if (level != LogLevel.Error && this.SuppressConsolePatterns.Any(p => p.IsMatch(message)))                  return; -            if (level == LogLevel.Error && this.SuppressConsoleErrorPatterns.Any(p => p.IsMatch(message))) -                return;              // show friendly error if applicable              foreach (var entry in this.ReplaceConsolePatterns) diff --git a/src/SMAPI/Metadata/CoreAssetPropagator.cs b/src/SMAPI/Metadata/CoreAssetPropagator.cs index a6bfab5c..9bb9a857 100644 --- a/src/SMAPI/Metadata/CoreAssetPropagator.cs +++ b/src/SMAPI/Metadata/CoreAssetPropagator.cs @@ -735,7 +735,7 @@ namespace StardewModdingAPI.Metadata              {                  Lazy<Texture2D> texture = new Lazy<Texture2D>(() => content.Load<Texture2D>(key));                  foreach (Tree tree in trees) -                    this.Reflection.GetField<Lazy<Texture2D>>(tree, "texture").SetValue(texture); +                    tree.texture = texture;                  return true;              } | 
