diff options
Diffstat (limited to 'azalea-protocol/src/connect.rs')
| -rwxr-xr-x | azalea-protocol/src/connect.rs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/azalea-protocol/src/connect.rs b/azalea-protocol/src/connect.rs index 567e4c40..fde24c40 100755 --- a/azalea-protocol/src/connect.rs +++ b/azalea-protocol/src/connect.rs @@ -52,7 +52,7 @@ pub struct WriteConnection<W: ProtocolPacket> { /// login::{ /// ClientboundLoginPacket, /// serverbound_hello_packet::ServerboundHelloPacket, -/// serverbound_key_packet::{ServerboundKeyPacket, NonceOrSaltSignature} +/// serverbound_key_packet::ServerboundKeyPacket /// }, /// handshake::client_intention_packet::ClientIntentionPacket /// } @@ -80,8 +80,7 @@ pub struct WriteConnection<W: ProtocolPacket> { /// // login /// conn.write( /// ServerboundHelloPacket { -/// username: "bot".to_string(), -/// public_key: None, +/// name: "bot".to_string(), /// profile_id: None, /// } /// .get(), @@ -96,8 +95,8 @@ pub struct WriteConnection<W: ProtocolPacket> { /// /// conn.write( /// ServerboundKeyPacket { -/// nonce_or_salt_signature: NonceOrSaltSignature::Nonce(e.encrypted_nonce), /// key_bytes: e.encrypted_public_key, +/// encrypted_challenge: e.encrypted_nonce, /// } /// .get(), /// ) @@ -131,7 +130,7 @@ where R: ProtocolPacket + Debug, { /// Read a packet from the stream. - pub async fn read(&mut self) -> Result<R, ReadPacketError> { + pub async fn read(&mut self) -> Result<R, Box<ReadPacketError>> { read_packet::<R, _>( &mut self.read_stream, &mut self.buffer, @@ -179,7 +178,7 @@ where W: ProtocolPacket + Debug, { /// Read a packet from the other side of the connection. - pub async fn read(&mut self) -> Result<R, ReadPacketError> { + pub async fn read(&mut self) -> Result<R, Box<ReadPacketError>> { self.reader.read().await } @@ -276,7 +275,7 @@ impl Connection<ClientboundLoginPacket, ServerboundLoginPacket> { /// use azalea_protocol::connect::Connection; /// use azalea_protocol::packets::login::{ /// ClientboundLoginPacket, - /// serverbound_key_packet::{ServerboundKeyPacket, NonceOrSaltSignature} + /// serverbound_key_packet::ServerboundKeyPacket /// }; /// use uuid::Uuid; /// # use azalea_protocol::ServerAddress; @@ -307,8 +306,8 @@ impl Connection<ClientboundLoginPacket, ServerboundLoginPacket> { /// ).await?; /// conn.write( /// ServerboundKeyPacket { - /// nonce_or_salt_signature: NonceOrSaltSignature::Nonce(e.encrypted_nonce), /// key_bytes: e.encrypted_public_key, + /// encrypted_challenge: e.encrypted_nonce, /// }.get() /// ).await?; /// conn.set_encryption_key(e.secret_key); |
