summaryrefslogtreecommitdiff
path: root/src/SMAPI/Patches
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2020-12-20 22:34:59 -0500
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2020-12-20 22:34:59 -0500
commitffe74869ca626883f3f65116fd19af2d4951156e (patch)
treedd36f409f25be442b22c93c2a8a47434bae7e479 /src/SMAPI/Patches
parent85cb824c3b96905d4e991946db61802a24e350c9 (diff)
downloadSMAPI-ffe74869ca626883f3f65116fd19af2d4951156e.tar.gz
SMAPI-ffe74869ca626883f3f65116fd19af2d4951156e.tar.bz2
SMAPI-ffe74869ca626883f3f65116fd19af2d4951156e.zip
update patches and asset propagation
Diffstat (limited to 'src/SMAPI/Patches')
-rw-r--r--src/SMAPI/Patches/DialogueErrorPatch.cs4
-rw-r--r--src/SMAPI/Patches/ScheduleErrorPatch.cs2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/SMAPI/Patches/DialogueErrorPatch.cs b/src/SMAPI/Patches/DialogueErrorPatch.cs
index 42494390..215df561 100644
--- a/src/SMAPI/Patches/DialogueErrorPatch.cs
+++ b/src/SMAPI/Patches/DialogueErrorPatch.cs
@@ -135,11 +135,9 @@ namespace StardewModdingAPI.Patches
IReflectedMethod translateArraysOfStrings = DialogueErrorPatch.Reflection.GetMethod(typeof(Dialogue), "TranslateArraysOfStrings");
IReflectedMethod parseDialogueString = DialogueErrorPatch.Reflection.GetMethod(__instance, "parseDialogueString");
IReflectedMethod checkForSpecialDialogueAttributes = DialogueErrorPatch.Reflection.GetMethod(__instance, "checkForSpecialDialogueAttributes");
- IReflectedField<List<string>> dialogues = DialogueErrorPatch.Reflection.GetField<List<string>>(__instance, "dialogues");
// replicate base constructor
- if (dialogues.GetValue() == null)
- dialogues.SetValue(new List<string>());
+ __instance.dialogues ??= new List<string>();
// duplicate code with try..catch
try
diff --git a/src/SMAPI/Patches/ScheduleErrorPatch.cs b/src/SMAPI/Patches/ScheduleErrorPatch.cs
index 17db07a6..1d58a292 100644
--- a/src/SMAPI/Patches/ScheduleErrorPatch.cs
+++ b/src/SMAPI/Patches/ScheduleErrorPatch.cs
@@ -51,7 +51,7 @@ namespace StardewModdingAPI.Patches
#endif
{
harmony.Patch(
- original: AccessTools.Method(typeof(NPC), "parseMasterSchedule"),
+ original: AccessTools.Method(typeof(NPC), nameof(NPC.parseMasterSchedule)),
#if HARMONY_2
finalizer: new HarmonyMethod(this.GetType(), nameof(ScheduleErrorPatch.Finalize_NPC_parseMasterSchedule))
#else