From fe4505303e51485f60c9883ba3f76de98eef8b3b Mon Sep 17 00:00:00 2001 From: Ceikry Date: Sat, 28 Mar 2020 06:22:19 -0500 Subject: [PATCH] made it more flexible --- .../crandor/game/content/dialogue/DialogueInterpreter.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Server/src/org/crandor/game/content/dialogue/DialogueInterpreter.java b/Server/src/org/crandor/game/content/dialogue/DialogueInterpreter.java index 36cc4cc69..e17b0fcf0 100644 --- a/Server/src/org/crandor/game/content/dialogue/DialogueInterpreter.java +++ b/Server/src/org/crandor/game/content/dialogue/DialogueInterpreter.java @@ -101,8 +101,11 @@ public final class DialogueInterpreter { if (args.length > 0 && args[0] instanceof NPC) { NPC npc = (NPC) args[0]; npc.setDialoguePlayer(player); - npc.getWalkingQueue().reset(); - npc.getPulseManager().clear(); + try { //this prevents the dialogue interpreter from dying when you try opening an NPC's dialogue without passing the NPC itself as an argument + npc.getWalkingQueue().reset(); + npc.getPulseManager().clear(); + } catch(Exception e){ + } } else if (args.length < 1) { args = new Object[] { dialogueKey }; }