From 5ea49425c74508dc59991a96fe8141b98890c886 Mon Sep 17 00:00:00 2001
From: Martin Michelsen <fuzziqersoftware+g@gmail.com>
Date: Wed, 17 Apr 2024 00:39:26 -0700
Subject: [PATCH] don't fail on proxy server if maps don't load properly

---
 src/ProxyCommands.cc | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/ProxyCommands.cc b/src/ProxyCommands.cc
index aa9fa025..bb326ff3 100644
--- a/src/ProxyCommands.cc
+++ b/src/ProxyCommands.cc
@@ -1374,16 +1374,20 @@ static HandlerResult S_13_A7(shared_ptr<ProxyServer::LinkedSession> ses, uint16_
 
     if (!sf->is_download && ends_with(sf->basename, ".dat")) {
       auto quest_dat_data = make_shared<std::string>(join(sf->blocks));
-      ses->map = Lobby::load_maps(
-          ses->version(),
-          ses->lobby_episode,
-          ses->lobby_difficulty,
-          ses->lobby_event,
-          ses->id,
-          Map::DEFAULT_RARE_ENEMIES,
-          ses->lobby_random_seed,
-          make_shared<PSOV2Encryption>(ses->lobby_random_seed),
-          quest_dat_data);
+      try {
+        ses->map = Lobby::load_maps(
+            ses->version(),
+            ses->lobby_episode,
+            ses->lobby_difficulty,
+            ses->lobby_event,
+            ses->id,
+            Map::DEFAULT_RARE_ENEMIES,
+            ses->lobby_random_seed,
+            make_shared<PSOV2Encryption>(ses->lobby_random_seed),
+            quest_dat_data);
+      } catch (const exception& e) {
+        ses->log.warning("Failed to load quest map: %s", e.what());
+      }
     }
 
     ses->saving_files.erase(cmd.filename.decode());