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

don't send spectator join commands if battle is already finished

Browse Source
This commit is contained in:
Martin Michelsen
2023-09-17 12:49:18 -07:00
parent 3c1c63f24e
commit 72155939d5
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TODO.md
+1 -1
View File
@@ -19,7 +19,7 @@
- Make disconnecting during a tournament match cause you to forfeit the match - Make disconnecting during a tournament match cause you to forfeit the match
- Enforce tournament deck restrictions (e.g. rarity checks, No Assist option) when populating COMs at tournament start time - Enforce tournament deck restrictions (e.g. rarity checks, No Assist option) when populating COMs at tournament start time
- Spectator teams - Spectator teams
- Fix behavior when joining a spectator team after the beginning of a battle - Send 6xB4x4C, etc. commands when joining a spectator team - maybe this makes it load faster?
- Figure out why spectators crash during replays sometimes - Figure out why spectators crash during replays sometimes
- Spectator teams sometimes stop receiving commands during live battles? - Spectator teams sometimes stop receiving commands during live battles?
src/ReceiveCommands.cc
+2
View File
@@ -3505,9 +3505,11 @@ static void on_6F(shared_ptr<ServerState> s, shared_ptr<Client> c,
l->battle_player->start(); l->battle_player->start();
} else if (watched_lobby && watched_lobby->ep3_server) { } else if (watched_lobby && watched_lobby->ep3_server) {
send_ep3_update_spectator_count(watched_lobby); send_ep3_update_spectator_count(watched_lobby);
if (!watched_lobby->ep3_server->battle_finished) {
watched_lobby->ep3_server->send_commands_for_joining_spectator( watched_lobby->ep3_server->send_commands_for_joining_spectator(
c->channel, c->flags & Client::Flag::IS_EP3_TRIAL_EDITION); c->channel, c->flags & Client::Flag::IS_EP3_TRIAL_EDITION);
} }
}
// If there are more players to bring in, try to do so // If there are more players to bring in, try to do so
c->disconnect_hooks.erase(ADD_NEXT_CLIENT_DISCONNECT_HOOK_NAME); c->disconnect_hooks.erase(ADD_NEXT_CLIENT_DISCONNECT_HOOK_NAME);