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

handle stray server data commands

Browse Source
This commit is contained in:
Martin Michelsen
2022-12-15 12:54:29 -08:00
parent 1bb0545b21
commit 224e0df87e
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ReceiveCommands.cc
+10 -2
View File
@@ -1259,8 +1259,16 @@ static void on_tournament_bracket_updated(
static void on_ep3_server_data_request(shared_ptr<ServerState> s, shared_ptr<Client> c, static void on_ep3_server_data_request(shared_ptr<ServerState> s, shared_ptr<Client> c,
uint16_t, uint32_t, const string& data) { // CA uint16_t, uint32_t, const string& data) { // CA
auto l = s->find_lobby(c->lobby_id); shared_ptr<Lobby> l;
if (!l || !(l->flags & Lobby::Flag::EPISODE_3_ONLY) || !l->is_game()) { try {
l = s->find_lobby(c->lobby_id);
} catch (const out_of_range&) {
// In rare cases (e.g. when two players end a tournament's match results
// screens at exactly the same time), the client can send a server data
// command when it's not in any lobby at all. We just ignore such commands.
return;
}
if (!(l->flags & Lobby::Flag::EPISODE_3_ONLY) || !l->is_game()) {
throw runtime_error("Episode 3 server data request sent outside of Episode 3 game"); throw runtime_error("Episode 3 server data request sent outside of Episode 3 game");
} }