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

fix incorrect behavior when attempting to start non-pending tournament match

Browse Source
This commit is contained in:
Martin Michelsen
2022-12-14 23:35:08 -08:00
parent c01d1f623c
commit 27cdf7e078
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ReceiveCommands.cc
+4 -3
View File
@@ -959,7 +959,7 @@ static bool add_next_game_client(
return true; return true;
} }
static bool start_ep3_battle_table_game_if_pending( static bool start_ep3_battle_table_game_if_ready(
shared_ptr<ServerState> s, shared_ptr<ServerState> s,
shared_ptr<Lobby> l, shared_ptr<Lobby> l,
int16_t table_number, int16_t table_number,
@@ -1017,7 +1017,8 @@ static bool start_ep3_battle_table_game_if_pending(
// neither are null. // neither are null.
auto tourn_match = (tourn_matches.size() == 1) ? *tourn_matches.begin() : nullptr; auto tourn_match = (tourn_matches.size() == 1) ? *tourn_matches.begin() : nullptr;
auto tourn = tourn_match ? tourn_match->tournament.lock() : nullptr; auto tourn = tourn_match ? tourn_match->tournament.lock() : nullptr;
if (!tourn) { if (!tourn || !tourn_match->preceding_a->winner_team || !tourn_match->preceding_b->winner_team) {
tourn.reset();
tourn_match.reset(); tourn_match.reset();
} }
@@ -1132,7 +1133,7 @@ static bool start_ep3_battle_table_game_if_pending(
static void on_ep3_battle_table_state_updated( static void on_ep3_battle_table_state_updated(
shared_ptr<ServerState> s, shared_ptr<Lobby> l, int16_t table_number) { shared_ptr<ServerState> s, shared_ptr<Lobby> l, int16_t table_number) {
send_ep3_card_battle_table_state(l, table_number); send_ep3_card_battle_table_state(l, table_number);
start_ep3_battle_table_game_if_pending(s, l, table_number, 2); start_ep3_battle_table_game_if_ready(s, l, table_number, 2);
} }
static void on_ep3_battle_table_state(shared_ptr<ServerState> s, static void on_ep3_battle_table_state(shared_ptr<ServerState> s,