From 567c6f4f2c39976d170111b816806453636f8241 Mon Sep 17 00:00:00 2001 From: mat Date: Sun, 1 May 2022 21:54:03 -0500 Subject: Reduce usage of AsyncRead We already receive everything from the server when it tells us the length, so we can actually just treat the stream as a Read instead of an AsyncRead. --- .../src/packets/game/clientbound_player_abilities_packet.rs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'azalea-protocol/src/packets/game/clientbound_player_abilities_packet.rs') diff --git a/azalea-protocol/src/packets/game/clientbound_player_abilities_packet.rs b/azalea-protocol/src/packets/game/clientbound_player_abilities_packet.rs index f4f528cf..3ca1ac85 100755 --- a/azalea-protocol/src/packets/game/clientbound_player_abilities_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_player_abilities_packet.rs @@ -1,9 +1,7 @@ -// i don't know the actual name of this packet, i couldn't find it in the source code +use std::io::Read; use crate::mc_buf::{McBufReadable, McBufWritable, Readable}; -use async_trait::async_trait; use packet_macros::GamePacket; -use tokio::io::AsyncRead; #[derive(Clone, Debug, GamePacket)] pub struct ClientboundPlayerAbilitiesPacket { @@ -21,13 +19,9 @@ pub struct PlayerAbilitiesFlags { pub instant_break: bool, } -#[async_trait] impl McBufReadable for PlayerAbilitiesFlags { - async fn read_into(buf: &mut R) -> Result - where - R: AsyncRead + std::marker::Unpin + std::marker::Send, - { - let byte = buf.read_byte().await?; + fn read_into(buf: &mut impl Read) -> Result { + let byte = buf.read_byte()?; Ok(PlayerAbilitiesFlags { invulnerable: byte & 1 != 0, flying: byte & 2 != 0, -- cgit v1.2.3