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 some clippy warnings

Browse Source
This commit is contained in:
NG (Graham)
2025-10-02 21:52:35 -04:00
parent aa690007b7
commit 214599ce9a
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rc_multiplayer/src/matches/fake/client_ai.rs
View File

@@ -33,7 +33,7 @@ impl super::FakeUser for ClientAIPlayer {
let first_fake_i = descriptors.iter() let first_fake_i = descriptors.iter()
.filter(|x| x.team == self.me.team) .filter(|x| x.team == self.me.team)
.enumerate() .enumerate()
.find(|x| x.1.mode != None) .find(|x| x.1.mode.is_some())
.map(|(i, _)| i) .map(|(i, _)| i)
.unwrap(); .unwrap();
let my_i = descriptors.iter() let my_i = descriptors.iter()

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

@@ -239,7 +239,7 @@ impl <L: super::CustomGameLogic> GenericGamemodeEngine<L> {
.collect();*/ .collect();*/
let descriptors = players.iter() let descriptors = players.iter()
.map(|player| (player.player_id as u8, UserDescriptor::new(player.to_owned()))) .map(|player| (player.player_id, UserDescriptor::new(player.to_owned())))
.collect(); .collect();
let user_id_map = players.iter() let user_id_map = players.iter()
@@ -538,7 +538,7 @@ impl <L: super::CustomGameLogic> GenericGamemodeEngine<L> {
for fake_id in conn.aliases.iter() { for fake_id in conn.aliases.iter() {
if let Some(user_desc) = self.user_descriptor(*fake_id) { if let Some(user_desc) = self.user_descriptor(*fake_id) {
user_desc.state.mode.store(ConnectionMode::Disconnected.to_u8(), std::sync::atomic::Ordering::Relaxed); user_desc.state.mode.store(ConnectionMode::Disconnected.to_u8(), std::sync::atomic::Ordering::Relaxed);
let conn_opt = self.users.write().await.remove(&fake_id); let conn_opt = self.users.write().await.remove(fake_id);
if let Some(conn) = conn_opt { if let Some(conn) = conn_opt {
if self.custom_logic_handler.on_player_end(self, &conn, user_desc).await { if self.custom_logic_handler.on_player_end(self, &conn, user_desc).await {
disconnecting_players.push(*fake_id); disconnecting_players.push(*fake_id);

2
rc_multiplayer/src/matches/modes/team_death_match.rs
View File

@@ -259,7 +259,7 @@ impl TeamDeathMatchLogic {
async fn do_respawn_tasks(&self, generic: &crate::matches::GenericGamemodeEngine<Self>, player_id: u8) { async fn do_respawn_tasks(&self, generic: &crate::matches::GenericGamemodeEngine<Self>, player_id: u8) {
log::info!("Handling respawn player {} in game {}", player_id, generic.game_guid()); log::info!("Handling respawn player {} in game {}", player_id, generic.game_guid());
let respawn_time = std::time::Duration::from_secs(self.settings.respawn_time_seconds as u64); let respawn_time = std::time::Duration::from_secs(self.settings.respawn_time_seconds);
let now = chrono::Utc::now(); let now = chrono::Utc::now();
let respawn_timestamp = now + respawn_time; let respawn_timestamp = now + respawn_time;
if let Some(player_respawn) = self.player_tracking.respawns.get(&player_id) { if let Some(player_respawn) = self.player_tracking.respawns.get(&player_id) {