From bcf1038148b420637eaffca92d51c4af166951dd Mon Sep 17 00:00:00 2001 From: Kyler <59854022+KylerOlsen@users.noreply.github.com> Date: Sat, 15 Jun 2024 15:20:43 -0600 Subject: [PATCH] Updated login::serverbound::LoginStart packet --- src/login.rs | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/login.rs b/src/login.rs index 14f2887..9885ba9 100644 --- a/src/login.rs +++ b/src/login.rs @@ -302,7 +302,7 @@ pub mod serverbound { pub struct LoginStart { pub name: String, - pub player_uuid: Option, + pub player_uuid: u128, } impl Packet for LoginStart { @@ -311,11 +311,7 @@ pub mod serverbound { fn get(mut data: &mut Vec) -> Result { let name = mc_types::get_string(&mut data)?; - let has_uuid = mc_types::get_bool(&mut data); - let mut player_uuid: Option = None; - if has_uuid { - player_uuid = Some(mc_types::get_uuid(&mut data)); - } + let player_uuid: u128 = mc_types::get_uuid(&mut data); Ok(Self { name, player_uuid, @@ -326,13 +322,7 @@ pub mod serverbound { let mut data: Vec = vec![]; data.append(&mut mc_types::convert_var_int(Self::packet_id())); data.append(&mut mc_types::convert_string(&self.name)); - match self.player_uuid { - Some(value) => { - data.append(&mut mc_types::convert_bool(true)); - data.append(&mut mc_types::convert_uuid(value)); - }, - None => data.append(&mut mc_types::convert_bool(false)) - } + data.append(&mut mc_types::convert_uuid(self.player_uuid)); data }