diff options
Diffstat (limited to 'minecraft-protocol/src/packets/status')
| -rw-r--r-- | minecraft-protocol/src/packets/status/clientbound_status_response_packet.rs | 9 | ||||
| -rw-r--r-- | minecraft-protocol/src/packets/status/serverbound_status_request_packet.rs | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/minecraft-protocol/src/packets/status/clientbound_status_response_packet.rs b/minecraft-protocol/src/packets/status/clientbound_status_response_packet.rs index 38747cc8..28ac9b16 100644 --- a/minecraft-protocol/src/packets/status/clientbound_status_response_packet.rs +++ b/minecraft-protocol/src/packets/status/clientbound_status_response_packet.rs @@ -14,18 +14,17 @@ pub struct ClientboundStatusResponsePacket { #[async_trait] impl PacketTrait for ClientboundStatusResponsePacket { - fn get(&self) -> Packet { - Packet::ClientboundStatusResponsePacket(self.clone()) + fn get(self) -> Packet { + Packet::ClientboundStatusResponsePacket(self) } fn write(&self, _buf: &mut Vec<u8>) {} async fn read<T: tokio::io::AsyncRead + std::marker::Unpin + std::marker::Send>( buf: &mut BufReader<T>, - ) -> Result<Packet<'_>, String> { + ) -> Result<Packet, String> { let status = mc_buf::read_utf(buf).await?; // this.status = GsonHelper.fromJson(GSON, friendlyByteBuf.readUtf(32767), ServerStatus.class); - let packet = ClientboundStatusResponsePacket { status }.get(); - Ok(packet) + Ok(ClientboundStatusResponsePacket { status }.get()) } } diff --git a/minecraft-protocol/src/packets/status/serverbound_status_request_packet.rs b/minecraft-protocol/src/packets/status/serverbound_status_request_packet.rs index b3c87968..1a301a4d 100644 --- a/minecraft-protocol/src/packets/status/serverbound_status_request_packet.rs +++ b/minecraft-protocol/src/packets/status/serverbound_status_request_packet.rs @@ -7,19 +7,19 @@ use crate::{ packets::{Packet, PacketTrait}, }; -#[derive(Hash)] +#[derive(Hash, Clone)] pub struct ServerboundStatusRequestPacket {} #[async_trait] impl PacketTrait for ServerboundStatusRequestPacket { - fn get(&self) -> Packet { - Packet::ServerboundStatusRequestPacket(*self) + fn get(self) -> Packet { + Packet::ServerboundStatusRequestPacket(self) } fn write(&self, _buf: &mut Vec<u8>) {} async fn read<T: tokio::io::AsyncRead + std::marker::Unpin + std::marker::Send>( buf: &mut BufReader<T>, - ) -> Result<Packet<'_>, String> { + ) -> Result<Packet, String> { Err("ServerboundStatusRequestPacket::read not implemented".to_string()) } } |
