diff options
| author | mat <27899617+mat-1@users.noreply.github.com> | 2026-01-13 10:51:30 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-13 10:51:30 -0600 |
| commit | d5fa5e32b37754b3b5c136e58821e48cd3b7c2ff (patch) | |
| tree | ea04702f96ad170fb1d90e5ed2dc875ae8166495 /azalea-client/src/plugins/join.rs | |
| parent | efb36d5fc0fe56a98f5795c53dfa109887cd5aae (diff) | |
| download | azalea-drasl-d5fa5e32b37754b3b5c136e58821e48cd3b7c2ff.tar.xz | |
Rename Instance to World (#304)
Diffstat (limited to 'azalea-client/src/plugins/join.rs')
| -rw-r--r-- | azalea-client/src/plugins/join.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/azalea-client/src/plugins/join.rs b/azalea-client/src/plugins/join.rs index c254bc26..a6c9c586 100644 --- a/azalea-client/src/plugins/join.rs +++ b/azalea-client/src/plugins/join.rs @@ -11,7 +11,7 @@ use azalea_protocol::{ login::{ClientboundLoginPacket, ServerboundHello, ServerboundLoginPacket}, }, }; -use azalea_world::Instance; +use azalea_world::World; use bevy_app::prelude::*; use bevy_ecs::prelude::*; use bevy_tasks::{IoTaskPool, Task, futures_lite::future}; @@ -23,6 +23,7 @@ use crate::{ LocalPlayerBundle, account::Account, connection::RawConnection, + local_player::WorldHolder, packet::login::{InLoginState, SendLoginPacketEvent}, }; @@ -204,12 +205,12 @@ pub fn poll_create_connection_task( let (read_conn, write_conn) = conn.into_split(); let (read_conn, write_conn) = (read_conn.raw, write_conn.raw); - let instance = Instance::default(); - let instance_holder = crate::local_player::InstanceHolder::new( + let world = World::default(); + let world_holder = WorldHolder::new( entity, // default to an empty world, it'll be set correctly later when we // get the login packet - Arc::new(RwLock::new(instance)), + Arc::new(RwLock::new(world)), ); entity_mut.insert(( @@ -220,7 +221,7 @@ pub fn poll_create_connection_task( write_conn, ConnectionProtocol::Login, ), - instance_holder, + world_holder, metadata: azalea_entity::metadata::PlayerMetadataBundle::default(), }, InLoginState, |
