Merge pull request #397 from runejs/kat/dialogue-fix

Fixing a bug causing dialogue to crash and fail
runejs · Jun 29, 2023 · 0196052 · 0196052
2 parents 39978a0 + 8305229
commit 0196052
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/engine/world/actor/dialogue.ts b/src/engine/world/actor/dialogue.ts
@@ -365,15 +365,14 @@ function parseDialogueTree(player: Player, npcParticipants: NpcParticipant[], di
                 }
 
                 dialogueDetails = dialogueAction(npc);
+
+                if (npc === -1) {
+                    throw new Error('No npc found for dialogue action.');
+                }
             } else {
                 dialogueDetails = dialogueAction(player);
             }
 
-            // TODO (Jameskmonger) not sure if this check is needed, added it when getting TypeScript types into strict mode
-            if (npc === -1) {
-                throw new Error('No npc found for dialogue action.');
-            }
-
             const emote = dialogueDetails[0] as Emote;
             const text = carryoverDialogue.join(' ') + dialogueDetails[1] as string;
             carryoverDialogue = [];
@@ -582,10 +581,10 @@ async function runDialogueAction(player: Player, dialogueAction: string | Dialog
 
             if (dialogueAction.type === 'NPC') {
                 npcId = (dialogueAction as NpcDialogueAction).npcId;
-            }
-            // TODO (Jameskmonger) not sure if this check is needed, added it when getting TypeScript types into strict mode
-            if (npcId === -1) {
-                throw new Error('No npc found for dialogue action.');
+
+                if (npcId === -1) {
+                    throw new Error('No npc found for dialogue action.');
+                }
             }
 
             const actorDialogueAction = dialogueAction as ActorDialogueAction;