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

send tournament result before battle end command

Browse Source
This commit is contained in:
Martin Michelsen
2023-05-23 21:53:45 -07:00
parent 7ae87f9949
commit 03c26b587a
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ReceiveCommands.cc
+5 -2
View File
@@ -1325,10 +1325,12 @@ static void on_CA_Ep3(shared_ptr<ServerState> s, shared_ptr<Client> c,
}
}
l->ep3_server_base->server->on_server_data_input(data);
if (l->ep3_server_base->server->battle_finished && l->tournament_match) {
if (l->tournament_match &&
l->ep3_server_base->server->setup_phase == Episode3::SetupPhase::BATTLE_ENDED &&
!l->ep3_server_base->server->tournament_match_result_sent) {
int8_t winner_team_id = l->ep3_server_base->server->get_winner_team_id();
if (winner_team_id == -1) {
throw runtime_error("match concluded, but winner team not specified");
throw runtime_error("match complete, but winner team not specified");
}
auto tourn = l->tournament_match->tournament.lock();
@@ -1344,6 +1346,7 @@ static void on_CA_Ep3(shared_ptr<ServerState> s, shared_ptr<Client> c,
send_ep3_tournament_match_result(l, l->tournament_match);
on_tournament_bracket_updated(s, tourn);
l->ep3_server_base->server->tournament_match_result_sent = true;
}
}