From e77228fa97cb4ffe1dc4d6c2b8123ff8c7df66af Mon Sep 17 00:00:00 2001
From: Martin Michelsen <fuzziqersoftware+g@gmail.com>
Date: Sat, 7 Jan 2023 09:07:04 -0800
Subject: [PATCH] clear client tournament state when starting proxy session

---
 src/ReceiveCommands.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/ReceiveCommands.cc b/src/ReceiveCommands.cc
index 83e26f09..66eb0a55 100644
--- a/src/ReceiveCommands.cc
+++ b/src/ReceiveCommands.cc
@@ -1858,6 +1858,12 @@ static void on_10(shared_ptr<ServerState> s, shared_ptr<Client> c,
           send_message_box(c, u"$C6No such destination exists.");
           c->should_disconnect = true;
         } else {
+          // Clear Check Tactics menu so client won't see newserv tournament
+          // state while logically on another server
+          if (c->flags & Client::Flag::IS_EPISODE_3) {
+            send_ep3_confirm_tournament_entry(s, c, nullptr);
+          }
+
           c->proxy_destination_address = resolve_ipv4(dest->first);
           c->proxy_destination_port = dest->second;
           if (!(c->flags & Client::Flag::SAVE_ENABLED)) {