More Custom NPC: fix 'set flag' not being set if the cutscene is skipped

maddie480 · Sep 6, 2023 · 14cba4a · 14cba4a
1 parent 972c3f6
commit 14cba4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Entities/MoreCustomNPC.cs b/Entities/MoreCustomNPC.cs
@@ -124,7 +124,7 @@ public MoreCustomNPC(EntityData data, Vector2 offset, EntityID id) : base(data,
 
                     // for dialogue that plays only once: the talker (speech bubble) is removed when it is over.
                     // for dialogue that loops: the session counter is reset to 0 once all dialog IDs have been played.
-                    if (toRemove.Contains(Talker) || session.GetCounter(id.ToString() + "DialogCounter") == 0) {
+                    if (toRemove.Contains(Talker) || Talker.Entity == null || session.GetCounter(id.ToString() + "DialogCounter") == 0) {
                         session.SetFlag(setFlag);
                     }
                 };

diff --git a/everest.yaml b/everest.yaml
@@ -1,6 +1,6 @@
 # The mod used to be known as "max480's Helping Hand", and wasn't renamed for compatibility reasons
 - Name: MaxHelpingHand
-  Version: 1.28.1
+  Version: 1.28.2
   DLL: bin/Release/net452/MaxHelpingHand.dll
   Dependencies:
     - Name: Everest