diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-05-20 19:38:08 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-05-20 19:38:08 -0400 |
| commit | 310eb1fe9afdb820d5584a46200bf073fc00ccb7 (patch) | |
| tree | 72c16c6d4f8447f45e8e6612cb25cd255d2b308c /src/SMAPI/Patches/LoadErrorPatch.cs | |
| parent | aa5cc2c9be8bdc79c6fa7b1b9c2581a05b88117d (diff) | |
| parent | c5c30189e43f93c3f3c66207945187a974656c9e (diff) | |
| download | SMAPI-310eb1fe9afdb820d5584a46200bf073fc00ccb7.tar.gz SMAPI-310eb1fe9afdb820d5584a46200bf073fc00ccb7.tar.bz2 SMAPI-310eb1fe9afdb820d5584a46200bf073fc00ccb7.zip | |
Merge branch 'mod/harmony-2.0' into develop
# Conflicts:
# docs/release-notes.md
# src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
Diffstat (limited to 'src/SMAPI/Patches/LoadErrorPatch.cs')
| -rw-r--r-- | src/SMAPI/Patches/LoadErrorPatch.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/SMAPI/Patches/LoadErrorPatch.cs b/src/SMAPI/Patches/LoadErrorPatch.cs index 77415ff2..f8ad6693 100644 --- a/src/SMAPI/Patches/LoadErrorPatch.cs +++ b/src/SMAPI/Patches/LoadErrorPatch.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; -using Harmony; +using HarmonyLib; using StardewModdingAPI.Framework.Exceptions; using StardewModdingAPI.Framework.Patching; using StardewValley; @@ -49,7 +49,7 @@ namespace StardewModdingAPI.Patches /// <summary>Apply the Harmony patch.</summary> /// <param name="harmony">The Harmony instance.</param> - public void Apply(HarmonyInstance harmony) + public void Apply(Harmony harmony) { harmony.Patch( original: AccessTools.Method(typeof(SaveGame), nameof(SaveGame.loadDataToLocations)), |