cargo clippy --fix

Snowiiii · Aug 14, 2024 · 03cc991 · 03cc991
1 parent 6485c99
commit 03cc991
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 21 deletions.
diff --git a/pumpkin-world/src/radial_chunk_iterator.rs b/pumpkin-world/src/radial_chunk_iterator.rs
@@ -1,4 +1,3 @@
-use std::collections::VecDeque;
 
 pub struct RadialIterator {
     radius: i32,

diff --git a/pumpkin-world/src/world.rs b/pumpkin-world/src/world.rs
@@ -1,19 +1,15 @@
 use std::{
     io::{Read, Seek},
     path::PathBuf,
-    sync::{atomic::AtomicUsize, Arc},
 };
 
 use flate2::bufread::ZlibDecoder;
 use itertools::Itertools;
 use rayon::prelude::*;
 use thiserror::Error;
 use tokio::{
-    fs::File,
     io::{AsyncReadExt, AsyncSeekExt},
-    runtime::Handle,
-    sync::{mpsc, oneshot, Mutex},
-    task::spawn_blocking,
+    sync::mpsc,
 };
 
 use crate::chunk::ChunkData;

diff --git a/pumpkin/src/client/client_packet.rs b/pumpkin/src/client/client_packet.rs
@@ -40,10 +40,8 @@ impl Client {
             if self.protocol_version < CURRENT_MC_PROTOCOL as i32 {
                 let protocol = self.protocol_version;
                 self.kick(&format!("Client outdated ({protocol}), Server uses Minecraft {CURRENT_MC_VERSION}, Protocol {CURRENT_MC_PROTOCOL}"));
-                return;
             } else if self.protocol_version > CURRENT_MC_PROTOCOL as i32 {
                 self.kick(&format!("Server outdated, Server uses Minecraft {CURRENT_MC_VERSION}, Protocol {CURRENT_MC_PROTOCOL}"));
-                return;
             }
         }
     }

diff --git a/pumpkin/src/commands/gamemode.rs b/pumpkin/src/commands/gamemode.rs
@@ -32,19 +32,13 @@ impl<'a> Command<'a> for GamemodeCommand {
             }
             Err(_) => {
                 // try to parse from number
-                match mode_str.parse::<u8>() {
-                    Ok(i) => match GameMode::from_u8(i) {
-                        Some(mode) => {
-                            player.set_gamemode(mode);
-                            player.send_system_message(
-                                format!("Set own game mode to {:?}", mode).into(),
-                            );
-                            return;
-                        }
-                        None => {}
-                    },
-                    Err(_) => {}
-                }
+                if let Ok(i) = mode_str.parse::<u8>() { if let Some(mode) = GameMode::from_u8(i) {
+                    player.set_gamemode(mode);
+                    player.send_system_message(
+                        format!("Set own game mode to {:?}", mode).into(),
+                    );
+                    return;
+                } }
 
                 player.send_system_message(
                     TextComponent::from("Invalid gamemode")