bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Fix multiplayer not ending with only one player ever connected

Browse Source
This commit is contained in:
NG (Graham)
2025-07-24 22:40:19 -04:00
parent 9f90c2e5fb
commit 194656933a
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rc_multiplayer/src/matches/modes/elimination.rs
View File

@@ -41,6 +41,17 @@ impl PlayerTracker {
only_alive_team
}
async fn alive_count(&self) -> std::collections::HashMap<u8, u8> {
let alive_lock = self.alive.lock().await;
let mut alive_players = std::collections::HashMap::new();
for (team, players) in alive_lock.iter() {
if !players.is_empty() {
alive_players.insert(*team, players.len() as u8);
}
}
alive_players
}
async fn teams(&self) -> std::collections::HashSet<u8> {
self.alive.lock().await.keys().map(|x| *x).collect()
}
@@ -120,6 +131,10 @@ impl CustomGameLogic for EliminationLogic {
}
generic.game_done();
self.abort_timer_sync().await;
} else if self.tracked.alive_count().await.is_empty() {
log::debug!("Everyone is dead, so long and thanks for all the fish");
generic.game_done();
self.abort_timer_sync().await;
}
true
}
@@ -171,7 +186,10 @@ impl CustomGameLogic for EliminationLogic {
&conn.connection.connection
).await);
}
} else if self.tracked.alive_count().await.is_empty() {
log::debug!("Everyone is dead, this must be the West Seth was talking about!");
generic.game_done();
self.abort_timer_sync().await;
}
true
}