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 on_new_connection crash from misconfigured clients

Browse Source
This commit is contained in:
NG (Graham)
2026-01-03 15:57:46 -05:00
parent 2f826835dc
commit cba0feaf03
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -518,7 +518,17 @@ impl <L: super::CustomGameLogic> GenericGamemodeEngine<L> {
//tokio::time::sleep(std::time::Duration::from_secs(1)).await;
//let id = users.len() as u8;
let user_id = user.user_id();
let player_info = self.descriptors.values().find(|p| p.descriptor.user_id == Some(user_id)).unwrap();
let player_info_opt = self.descriptors.values().find(|p| p.descriptor.user_id == Some(user_id));
if player_info_opt.is_none() {
log::warn!("User {} tried to connect to match {} which they are not in", user_id, self.game_guid());
connection.goodbye(&sender).await;
response.send(Some(super::messages::ErrorMessage {
message: format!("User {} not in match {})", user_id, self.game_guid()),
inner: None,
})).unwrap_or_default();
return;
}
let player_info = player_info_opt.unwrap();
let id = player_info.descriptor.player_id;
let aliases = self.fakes_handler.get_client_ais().await.into_iter().find(|(key, _val)| *key == id).map(|(_key, val)| val).unwrap_or_default();
log::info!("AIs running on new player {}: {:?}", id, aliases);