1 files changed, 25 insertions, 14 deletions

diff --git a/azalea-client/src/local_player.rs b/azalea-client/src/local_player.rs
index 540ef3b4..423b4308 100644
--- a/azalea-client/src/local_player.rs
+++ b/azalea-client/src/local_player.rs
@@ -1,14 +1,18 @@
 use std::{io, sync::Arc};
 
 use azalea_auth::game_profile::GameProfile;
-use azalea_core::ChunkPos;
+use azalea_core::{ChunkPos, GameMode};
 use azalea_protocol::packets::game::ServerboundGamePacket;
 use azalea_world::{
-    entity::{self, Dead},
-    Instance, PartialInstance,
+    entity::{self, Dead, WorldName},
+    Instance, InstanceContainer, PartialInstance,
 };
 use bevy_ecs::{
-    component::Component, entity::Entity, event::EventReader, query::Added, system::Query,
+    component::Component,
+    entity::Entity,
+    event::EventReader,
+    query::Added,
+    system::{Query, Res},
 };
 use derive_more::{Deref, DerefMut};
 use parking_lot::RwLock;
@@ -75,9 +79,17 @@ pub struct GameProfileComponent(pub GameProfile);
 
 /// Marks a [`LocalPlayer`] that's in a loaded chunk. This is updated at the
 /// beginning of every tick.
-#[derive(Component)]
+#[derive(Component, Clone, Debug, Copy)]
 pub struct LocalPlayerInLoadedChunk;
 
+/// The gamemode of a local player. For a non-local player, you can look up the
+/// player in the [`TabList`].
+#[derive(Component, Clone, Debug, Copy)]
+pub struct LocalGameMode {
+    pub current: GameMode,
+    pub previous: Option<GameMode>,
+}
+
 impl LocalPlayer {
     /// Create a new `LocalPlayer`.
     pub fn new(
@@ -104,7 +116,7 @@ impl LocalPlayer {
     }
 
     /// Write a packet directly to the server.
-    pub fn write_packet(&mut self, packet: ServerboundGamePacket) {
+    pub fn write_packet(&self, packet: ServerboundGamePacket) {
         self.packet_writer
             .send(packet)
             .expect("write_packet shouldn't be able to be called if the connection is closed");
@@ -122,16 +134,15 @@ impl Drop for LocalPlayer {
 /// Update the [`LocalPlayerInLoadedChunk`] component for all [`LocalPlayer`]s.
 pub fn update_in_loaded_chunk(
     mut commands: bevy_ecs::system::Commands,
-    query: Query<(Entity, &LocalPlayer, &entity::Position)>,
+    query: Query<(Entity, &WorldName, &entity::Position)>,
+    instance_container: Res<InstanceContainer>,
 ) {
     for (entity, local_player, position) in &query {
         let player_chunk_pos = ChunkPos::from(position);
-        let in_loaded_chunk = local_player
-            .world
-            .read()
-            .chunks
-            .get(&player_chunk_pos)
-            .is_some();
+        let instance_lock = instance_container
+            .get(local_player)
+            .expect("local player should always be in an instance");
+        let in_loaded_chunk = instance_lock.read().chunks.get(&player_chunk_pos).is_some();
         if in_loaded_chunk {
             commands.entity(entity).insert(LocalPlayerInLoadedChunk);
         } else {
@@ -176,7 +187,7 @@ pub fn handle_send_packet_event(
     mut query: Query<&mut LocalPlayer>,
 ) {
     for event in send_packet_events.iter() {
-        if let Ok(mut local_player) = query.get_mut(event.entity) {
+        if let Ok(local_player) = query.get_mut(event.entity) {
             local_player.write_packet(event.packet.clone());
         }
     }