Pumpkin-MC/Pumpkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed unwraps

Browse Source
This commit is contained in:
Alvsch 2024-10-16 23:53:23 +02:00
parent 4f17b96f1d
commit d35461eea1
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pumpkin/src/client/client_packet.rs
View File

@ -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},
};

13
pumpkin/src/client/mod.rs
View File

@ -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> {