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

Ignore client NPCs (aliased connections) when considering real players, fix #39

Browse Source
This commit is contained in:
NG (Graham)
2025-10-29 20:31:34 -04:00
parent 2cc467726f
commit 2007abd3df
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rc_multiplayer/src/matches/generic.rs
View File

@@ -705,7 +705,8 @@ impl <L: super::CustomGameLogic> GenericGamemodeEngine<L> {
let mut ready_count = 0; let mut ready_count = 0;
for (player_id, user) in self.users.read().await.iter() { for (player_id, user) in self.users.read().await.iter() {
let user_desc = self.user_descriptor(*player_id).unwrap(); let user_desc = self.user_descriptor(*player_id).unwrap();
if user.user.user_id() == user_id { if user.aliases.contains(player_id) { continue; }
if user.user.user_id() == user_id {
if !matches!(ConnectionMode::from_u8(user_desc.state.mode.load(std::sync::atomic::Ordering::Relaxed)), ConnectionMode::Loading | ConnectionMode::Disconnected) { if !matches!(ConnectionMode::from_u8(user_desc.state.mode.load(std::sync::atomic::Ordering::Relaxed)), ConnectionMode::Loading | ConnectionMode::Disconnected) {
log::warn!("Got RequestLoadingSync after user {} was already in/past WaitingForSync stage", user_id); log::warn!("Got RequestLoadingSync after user {} was already in/past WaitingForSync stage", user_id);
continue; continue;
@@ -718,6 +719,7 @@ impl <L: super::CustomGameLogic> GenericGamemodeEngine<L> {
} }
} }
let player_count = self.real_player_count(); let player_count = self.real_player_count();
log::info!("Real players {}, ready players {}", player_count, ready_count);
if ready_count == player_count { if ready_count == player_count {
log::info!("All players ({}) awaiting sync for game {}", player_count, self.game_guid()); log::info!("All players ({}) awaiting sync for game {}", player_count, self.game_guid());
for (user_key, conn) in self.users.read().await.iter() { for (user_key, conn) in self.users.read().await.iter() {