From d35461eea1fce59c19805c0a3bafb3033e32febf Mon Sep 17 00:00:00 2001
From: Alvsch <Alvsch@users.noreply.github.com>
Date: Wed, 16 Oct 2024 23:53:23 +0200
Subject: [PATCH] removed unwraps

---
 pumpkin/src/client/client_packet.rs |  2 +-
 pumpkin/src/client/mod.rs           | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pumpkin/src/client/client_packet.rs b/pumpkin/src/client/client_packet.rs
index aa26b1407..8440a9803 100644
--- a/pumpkin/src/client/client_packet.rs
+++ b/pumpkin/src/client/client_packet.rs
@@ -20,7 +20,7 @@ use uuid::Uuid;
 use crate::{
     client::authentication::{self, validate_textures, GameProfile},
     entity::player::{ChatMode, Hand},
-    proxy::{bungeecord::bungeecord_login, velocity::velocity_login},
+    proxy::{bungeecord::bungeecord_login, velocity::{receive_plugin_response, velocity_login}},
     server::{Server, CURRENT_MC_VERSION},
 };
 
diff --git a/pumpkin/src/client/mod.rs b/pumpkin/src/client/mod.rs
index 1692f48ca..a362ac19c 100644
--- a/pumpkin/src/client/mod.rs
+++ b/pumpkin/src/client/mod.rs
@@ -225,22 +225,21 @@ impl Client {
     ) -> Result<(), DeserializerError> {
         println!("{:?}", self.connection_state.load());
         match self.connection_state.load() {
-            pumpkin_protocol::ConnectionState::HandShake => self.handle_handshake_packet(packet).unwrap(),
-            pumpkin_protocol::ConnectionState::Status => self.handle_status_packet(server, packet).unwrap(),
+            pumpkin_protocol::ConnectionState::HandShake => self.handle_handshake_packet(packet),
+            pumpkin_protocol::ConnectionState::Status => self.handle_status_packet(server, packet),
             // TODO: Check config if transfer is enabled
             pumpkin_protocol::ConnectionState::Login
             | pumpkin_protocol::ConnectionState::Transfer => {
-                self.handle_login_packet(server, packet).await.unwrap()
+                self.handle_login_packet(server, packet).await
             }
             pumpkin_protocol::ConnectionState::Config => {
-                self.handle_config_packet(server, packet).await.unwrap()
+                self.handle_config_packet(server, packet).await
             }
             _ => {
                 log::error!("Invalid Connection state {:?}", self.connection_state);
-                // Ok(())
+                Ok(())
             }
-        };
-        Ok(())
+        }
     }
 
     fn handle_handshake_packet(&self, packet: &mut RawPacket) -> Result<(), DeserializerError> {