From 8b92b668d6fbaeadaa9d82894a97b9ae9c72c88c Mon Sep 17 00:00:00 2001 From: mat Date: Fri, 2 May 2025 02:21:54 +0000 Subject: [PATCH] merge main --- azalea-client/src/plugins/auto_reconnect.rs | 2 +- azalea-client/src/plugins/join.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azalea-client/src/plugins/auto_reconnect.rs b/azalea-client/src/plugins/auto_reconnect.rs index ea74987a..d6f49a5f 100644 --- a/azalea-client/src/plugins/auto_reconnect.rs +++ b/azalea-client/src/plugins/auto_reconnect.rs @@ -69,7 +69,7 @@ pub fn rejoin_after_delay( commands.entity(entity).remove::(); // our Entity will be reused since the account has the same uuid - join_events.send(StartJoinServerEvent { + join_events.write(StartJoinServerEvent { account: account.clone(), connect_opts: connect_opts.clone(), // not actually necessary since we're reusing the same entity and LocalPlayerEvents diff --git a/azalea-client/src/plugins/join.rs b/azalea-client/src/plugins/join.rs index 2d9572e3..285edb3d 100644 --- a/azalea-client/src/plugins/join.rs +++ b/azalea-client/src/plugins/join.rs @@ -177,7 +177,7 @@ pub fn poll_create_connection_task( Ok(conn) => conn, Err(error) => { warn!("failed to create connection: {error}"); - connection_failed_events.send(ConnectionFailedEvent { entity, error }); + connection_failed_events.write(ConnectionFailedEvent { entity, error }); return; } };