From 8ae7696b511684712387240f9134969745d0586d Mon Sep 17 00:00:00 2001 From: Martin Michelsen Date: Sat, 9 Dec 2023 19:21:26 -0800 Subject: [PATCH] fix $exit when v3 quests are loaded in ep3 games --- src/ChatCommands.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ChatCommands.cc b/src/ChatCommands.cc index e602ff4a..ed14114c 100644 --- a/src/ChatCommands.cc +++ b/src/ChatCommands.cc @@ -491,12 +491,12 @@ static void server_command_persist(shared_ptr c, const std::string&) { static void server_command_exit(shared_ptr c, const std::string&) { auto l = c->require_lobby(); if (l->is_game()) { - if (is_ep3(c->version())) { - c->channel.send(0xED, 0x00); - } else if (l->check_flag(Lobby::Flag::QUEST_IN_PROGRESS) || l->check_flag(Lobby::Flag::JOINABLE_QUEST_IN_PROGRESS)) { + if (l->check_flag(Lobby::Flag::QUEST_IN_PROGRESS) || l->check_flag(Lobby::Flag::JOINABLE_QUEST_IN_PROGRESS)) { G_UnusedHeader cmd = {0x73, 0x01, 0x0000}; c->channel.send(0x60, 0x00, cmd); c->floor = 0; + } else if (is_ep3(c->version())) { + c->channel.send(0xED, 0x00); } else { send_text_message(c, "$C6You must return to\nthe lobby first"); }