summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/release-notes.md1
-rw-r--r--src/SMAPI/Metadata/CoreAssetPropagator.cs2
2 files changed, 3 insertions, 0 deletions
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 0faf4913..c72e4454 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -10,6 +10,7 @@
* For modders:
* Fixed asset propagation on Linux/Mac for monster sprites, NPC dialogue, and NPC schedules.
+ * Fixed asset propagation for NPC dialogue sometimes causing a spouse to skip marriage dialogue or not allow kisses.
## 3.4.1
Released 24 March 2020 for Stardew Valley 1.4.1 or later.
diff --git a/src/SMAPI/Metadata/CoreAssetPropagator.cs b/src/SMAPI/Metadata/CoreAssetPropagator.cs
index 30b96c1d..0a14086b 100644
--- a/src/SMAPI/Metadata/CoreAssetPropagator.cs
+++ b/src/SMAPI/Metadata/CoreAssetPropagator.cs
@@ -892,11 +892,13 @@ namespace StardewModdingAPI.Metadata
// doesn't store the text itself.
foreach (NPC villager in villagers)
{
+ bool shouldSayMarriageDialogue = villager.shouldSayMarriageDialogue.Value;
MarriageDialogueReference[] marriageDialogue = villager.currentMarriageDialogue.ToArray();
villager.resetSeasonalDialogue(); // doesn't only affect seasonal dialogue
villager.resetCurrentDialogue();
+ villager.shouldSayMarriageDialogue.Set(shouldSayMarriageDialogue);
villager.currentMarriageDialogue.Set(marriageDialogue);
}