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/login/clientbound_hello_packet.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'azalea-protocol/src/packets/login/clientbound_hello_packet.rs') diff --git a/azalea-protocol/src/packets/login/clientbound_hello_packet.rs b/azalea-protocol/src/packets/login/clientbound_hello_packet.rs index 20af1bec..06f346c2 100755 --- a/azalea-protocol/src/packets/login/clientbound_hello_packet.rs +++ b/azalea-protocol/src/packets/login/clientbound_hello_packet.rs @@ -1,4 +1,4 @@ -use std::hash::Hash; +use std::{hash::Hash, io::Read}; use super::LoginPacket; use crate::mc_buf::Readable; @@ -19,12 +19,10 @@ impl ClientboundHelloPacket { panic!("ClientboundHelloPacket::write not implemented") } - pub async fn read( - buf: &mut T, - ) -> Result { - let server_id = buf.read_utf_with_len(20).await?; - let public_key = buf.read_byte_array().await?; - let nonce = buf.read_byte_array().await?; + pub fn read(buf: &mut impl Read) -> Result { + let server_id = buf.read_utf_with_len(20)?; + let public_key = buf.read_byte_array()?; + let nonce = buf.read_byte_array()?; Ok(ClientboundHelloPacket { server_id, -- cgit v1.2.3