From 460bdfb8bbaf0969df6451a00fc3de214728aec0 Mon Sep 17 00:00:00 2001
From: mat <github@matdoes.dev>
Date: Sat, 25 Jun 2022 16:23:40 -0500
Subject: merge ClientState and Client

---
 azalea-client/src/account.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'azalea-client/src/account.rs')

diff --git a/azalea-client/src/account.rs b/azalea-client/src/account.rs
index 56f4918a..32a46406 100644
--- a/azalea-client/src/account.rs
+++ b/azalea-client/src/account.rs
@@ -1,7 +1,8 @@
 //! Connect to Minecraft servers.
 
-use crate::Client;
+use crate::{Client, Event};
 use azalea_protocol::ServerAddress;
+use tokio::sync::mpsc::UnboundedReceiver;
 
 /// Something that can join Minecraft servers.
 pub struct Account {
@@ -14,7 +15,11 @@ impl Account {
         }
     }
 
-    pub async fn join(&self, address: &ServerAddress) -> Result<Client, String> {
+    /// Joins the Minecraft server on the given address using this account.
+    pub async fn join(
+        &self,
+        address: &ServerAddress,
+    ) -> Result<(Client, UnboundedReceiver<Event>), String> {
         Client::join(self, address).await
     }
 }
-- 
cgit v1.2.3