diff options
Diffstat (limited to 'azalea-protocol')
4 files changed, 10 insertions, 8 deletions
diff --git a/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs b/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs index 1db3cba6..c9476a45 100644 --- a/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs @@ -54,9 +54,11 @@ impl PlayerChatMessage { .content .decorated .clone() - .unwrap_or(Component::from(self.signed_body.content.plain.clone())); + .unwrap_or_else(|| Component::from(self.signed_body.content.plain.clone())); } - self.unsigned_content.clone().unwrap_or(self.message(true)) + self.unsigned_content + .clone() + .unwrap_or_else(|| self.message(true)) } } diff --git a/azalea-protocol/src/packets/game/clientbound_recipe_packet.rs b/azalea-protocol/src/packets/game/clientbound_recipe_packet.rs index 546eb6e4..4e19a114 100644 --- a/azalea-protocol/src/packets/game/clientbound_recipe_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_recipe_packet.rs @@ -46,9 +46,9 @@ impl McBufReadable for ClientboundRecipePacket { }; Ok(ClientboundRecipePacket { - action: action, - settings: settings, - recipes: recipes, + action, + settings, + recipes, }) } } diff --git a/azalea-protocol/src/packets/login/serverbound_hello_packet.rs b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs index 06cf1fa7..4d94092e 100755 --- a/azalea-protocol/src/packets/login/serverbound_hello_packet.rs +++ b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs @@ -2,14 +2,14 @@ use azalea_buf::McBuf; use azalea_protocol_macros::ServerboundLoginPacket; use uuid::Uuid; -#[derive(Clone, Debug, ServerboundLoginPacket, McBuf, PartialEq)] +#[derive(Clone, Debug, ServerboundLoginPacket, McBuf, PartialEq, Eq)] pub struct ServerboundHelloPacket { pub username: String, pub public_key: Option<ProfilePublicKeyData>, pub profile_id: Option<Uuid>, } -#[derive(Clone, Debug, McBuf, PartialEq)] +#[derive(Clone, Debug, McBuf, PartialEq, Eq)] pub struct ProfilePublicKeyData { pub expires_at: u64, pub key: Vec<u8>, diff --git a/azalea-protocol/src/read.rs b/azalea-protocol/src/read.rs index 3ff24f72..8a2aaf7d 100755 --- a/azalea-protocol/src/read.rs +++ b/azalea-protocol/src/read.rs @@ -83,7 +83,7 @@ fn packet_decoder<P: ProtocolPacket>(stream: &mut impl Read) -> Result<P, ReadPa // Packet ID let packet_id = u32::var_read_from(stream).map_err(|e| ReadPacketError::ReadPacketId { source: e })?; - P::read(packet_id.try_into().unwrap(), stream) + P::read(packet_id, stream) } // this is always true in multiplayer, false in singleplayer |