incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't fail on proxy server if maps don't load properly

Browse Source
This commit is contained in:
Martin Michelsen
2024-04-17 00:39:26 -07:00
parent 08ea9403e9
commit 5ea49425c7
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ProxyCommands.cc
+4
View File
@@ -1374,6 +1374,7 @@ static HandlerResult S_13_A7(shared_ptr<ProxyServer::LinkedSession> ses, uint16_
if (!sf->is_download && ends_with(sf->basename, ".dat")) { if (!sf->is_download && ends_with(sf->basename, ".dat")) {
auto quest_dat_data = make_shared<std::string>(join(sf->blocks)); auto quest_dat_data = make_shared<std::string>(join(sf->blocks));
try {
ses->map = Lobby::load_maps( ses->map = Lobby::load_maps(
ses->version(), ses->version(),
ses->lobby_episode, ses->lobby_episode,
@@ -1384,6 +1385,9 @@ static HandlerResult S_13_A7(shared_ptr<ProxyServer::LinkedSession> ses, uint16_
ses->lobby_random_seed, ses->lobby_random_seed,
make_shared<PSOV2Encryption>(ses->lobby_random_seed), make_shared<PSOV2Encryption>(ses->lobby_random_seed),
quest_dat_data); 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()); ses->saving_files.erase(cmd.filename.decode());