From 4e9b60138e4577a97161409defb9624ae58fc041 Mon Sep 17 00:00:00 2001 From: Kyler <59854022+KylerOlsen@users.noreply.github.com> Date: Fri, 31 May 2024 19:23:20 -0600 Subject: [PATCH] Fixed ProtocolConnection::split_conn function --- src/mc_types.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/mc_types.rs b/src/mc_types.rs index d6a0f51..9d71209 100644 --- a/src/mc_types.rs +++ b/src/mc_types.rs @@ -4,6 +4,7 @@ use std::error::Error; use std::fmt; use tokio::net::tcp::{OwnedReadHalf, OwnedWriteHalf}; +use tokio::net::TcpStream; use tokio::io::{AsyncReadExt, AsyncWriteExt}; use serde::{Serialize, Deserialize}; use async_trait::async_trait; @@ -193,15 +194,15 @@ impl<'a> ProtocolConnection<'a> { pub fn split_conn( &mut self - ) -> (WriteHaftProtocolConnection, ReadHaftProtocolConnection) { - (WriteHaftProtocolConnection { - stream_write: self.stream_write, - aes_encryption_key: self.aes_encryption_key, + ) -> Result<(WriteHaftProtocolConnection, ReadHaftProtocolConnection)> { + Ok((WriteHaftProtocolConnection { + stream_write: &mut self.stream_write, + aes_encryption_key: self.aes_encryption_key.clone(), }, ReadHaftProtocolConnection { - stream_read: self.stream_read, - aes_encryption_key: self.aes_encryption_key, - }) + stream_read: &mut self.stream_read, + aes_encryption_key: self.aes_encryption_key.clone(), + })) } }