Skip to content

Commit 5877e70

Browse files
sorokyaCopilot
andcommitted
Prevent followup dialog when quest warps you
Co-authored-by: Copilot <copilot@github.com>
1 parent 97a80f6 commit 5877e70

1 file changed

Lines changed: 19 additions & 12 deletions

File tree

src/map/map/quest/reply_to_quest_npc.rs

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -162,18 +162,25 @@ impl Map {
162162
None => return,
163163
};
164164

165-
player.send(
166-
PacketAction::Dialog,
167-
PacketFamily::Quest,
168-
&QuestDialogServerPacket {
169-
behavior_id: npc_data.behavior_id,
170-
quest_id,
171-
session_id,
172-
dialog_id: 0,
173-
quest_entries,
174-
dialog_entries,
175-
},
176-
);
165+
let warped = quest.states[progress.state as usize]
166+
.actions
167+
.iter()
168+
.any(|action| action.name == "SetMap");
169+
170+
if !warped {
171+
player.send(
172+
PacketAction::Dialog,
173+
PacketFamily::Quest,
174+
&QuestDialogServerPacket {
175+
behavior_id: npc_data.behavior_id,
176+
quest_id,
177+
session_id,
178+
dialog_id: 0,
179+
quest_entries,
180+
dialog_entries,
181+
},
182+
);
183+
}
177184

178185
let messages = quest.states[progress.state as usize]
179186
.actions

0 commit comments

Comments
 (0)