From 66338ce6eb0740632fc775878f168d94ebd81fca Mon Sep 17 00:00:00 2001 From: Alexander Medvedev Date: Sun, 16 Mar 2025 21:42:05 +0100 Subject: [PATCH] use `iter::values()` instead of raw iter --- pumpkin-world/src/world_info/anvil.rs | 2 +- pumpkin/src/entity/player.rs | 2 +- pumpkin/src/server/mod.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pumpkin-world/src/world_info/anvil.rs b/pumpkin-world/src/world_info/anvil.rs index 5c179e862..d027a3ab9 100644 --- a/pumpkin-world/src/world_info/anvil.rs +++ b/pumpkin-world/src/world_info/anvil.rs @@ -82,7 +82,7 @@ impl WorldInfoWriter for AnvilLevelInfo { let since_the_epoch = start .duration_since(UNIX_EPOCH) .expect("Time went backwards"); - let mut level_data = info.clone(); + let mut level_data = info; level_data.last_played = since_the_epoch.as_millis() as i64; let level = LevelDat { data: level_data }; diff --git a/pumpkin/src/entity/player.rs b/pumpkin/src/entity/player.rs index 9e134c152..01ecc7bb2 100644 --- a/pumpkin/src/entity/player.rs +++ b/pumpkin/src/entity/player.rs @@ -762,7 +762,7 @@ impl Player { // TODO: This should be optimized for larger servers based on the player's current chunk. pub async fn send_mobs(&self, world: &World) { let entities = world.entities.read().await.clone(); - for (_, entity) in entities { + for entity in entities.values() { self.client .send_packet(&entity.get_entity().create_spawn_packet()) .await; diff --git a/pumpkin/src/server/mod.rs b/pumpkin/src/server/mod.rs index e65527294..5a9517abd 100644 --- a/pumpkin/src/server/mod.rs +++ b/pumpkin/src/server/mod.rs @@ -327,7 +327,7 @@ impl Server { let mut players = Vec::>::new(); for world in self.worlds.read().await.iter() { - for (_, player) in world.players.read().await.iter() { + for player in world.players.read().await.values() { if player.client.address.lock().await.ip() == ip { players.push(player.clone()); } @@ -342,7 +342,7 @@ impl Server { let mut players = Vec::>::new(); for world in self.worlds.read().await.iter() { - for (_, player) in world.players.read().await.iter() { + for player in world.players.read().await.values() { players.push(player.clone()); } }