From 6e818852d868eea963dd2b8489ba75b65c56fb1c Mon Sep 17 00:00:00 2001 From: EightFactorial Date: Mon, 30 Jan 2023 16:18:14 -0800 Subject: More packet fixes, tests, handle error (#61) * Fix packet, fix tests, fixedbitsets * Clippy: Nightmare Mode * Fix mistake * simplify impl Display and make thing pub --------- Co-authored-by: mat --- .../packets/game/serverbound_player_abilities_packet.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'azalea-protocol/src/packets/game/serverbound_player_abilities_packet.rs') diff --git a/azalea-protocol/src/packets/game/serverbound_player_abilities_packet.rs b/azalea-protocol/src/packets/game/serverbound_player_abilities_packet.rs index 7f979363..1f8727ac 100755 --- a/azalea-protocol/src/packets/game/serverbound_player_abilities_packet.rs +++ b/azalea-protocol/src/packets/game/serverbound_player_abilities_packet.rs @@ -1,29 +1,29 @@ use crate::packets::BufReadError; use azalea_buf::{McBufReadable, McBufWritable}; +use azalea_core::FixedBitSet; use azalea_protocol_macros::ServerboundGamePacket; use std::io::Cursor; #[derive(Clone, Debug, ServerboundGamePacket)] pub struct ServerboundPlayerAbilitiesPacket { - is_flying: bool, + pub is_flying: bool, } impl McBufReadable for ServerboundPlayerAbilitiesPacket { fn read_from(buf: &mut Cursor<&[u8]>) -> Result { - let byte = u8::read_from(buf)?; + let set = FixedBitSet::<2>::read_from(buf)?; Ok(Self { - is_flying: byte & 2 != 0, + is_flying: set.index(1), }) } } impl McBufWritable for ServerboundPlayerAbilitiesPacket { fn write_into(&self, buf: &mut impl std::io::Write) -> Result<(), std::io::Error> { - let mut byte = 0; + let mut set = FixedBitSet::<2>::new(); if self.is_flying { - byte |= 2; + set.set(1); } - u8::write_into(&byte, buf)?; - Ok(()) + set.write_into(buf) } } -- cgit v1.2.3