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

fix game not being deleted if last player leaves by disconnecting

Browse Source
This commit is contained in:
Martin Michelsen
2022-03-07 22:46:48 -08:00
parent 12cc90ce50
commit 94c5802ca6
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ServerState.cc
+6 -1
View File
@@ -64,8 +64,12 @@ void ServerState::add_client_to_available_lobby(shared_ptr<Client> c) {
void ServerState::remove_client_from_lobby(shared_ptr<Client> c) { void ServerState::remove_client_from_lobby(shared_ptr<Client> c) {
auto l = this->id_to_lobby.at(c->lobby_id); auto l = this->id_to_lobby.at(c->lobby_id);
l->remove_client(c); l->remove_client(c);
if (!(l->flags & LobbyFlag::Persistent) && (l->count_clients() == 0)) {
this->remove_lobby(l->lobby_id);
} else {
send_player_leave_notification(l, c->lobby_client_id); send_player_leave_notification(l, c->lobby_client_id);
} }
}
void ServerState::change_client_lobby(shared_ptr<Client> c, shared_ptr<Lobby> new_lobby) { void ServerState::change_client_lobby(shared_ptr<Client> c, shared_ptr<Lobby> new_lobby) {
uint8_t old_lobby_client_id = c->lobby_client_id; uint8_t old_lobby_client_id = c->lobby_client_id;
@@ -83,9 +87,10 @@ void ServerState::change_client_lobby(shared_ptr<Client> c, shared_ptr<Lobby> ne
} }
if (current_lobby) { if (current_lobby) {
send_player_leave_notification(current_lobby, old_lobby_client_id);
if (!(current_lobby->flags & LobbyFlag::Persistent) && (current_lobby->count_clients() == 0)) { if (!(current_lobby->flags & LobbyFlag::Persistent) && (current_lobby->count_clients() == 0)) {
this->remove_lobby(current_lobby->lobby_id); this->remove_lobby(current_lobby->lobby_id);
} else {
send_player_leave_notification(current_lobby, old_lobby_client_id);
} }
} }
this->send_lobby_join_notifications(new_lobby, c); this->send_lobby_join_notifications(new_lobby, c);