From 84c0908f34b301c6ddb96ae4c314672f690f1bff Mon Sep 17 00:00:00 2001 From: mat Date: Sat, 6 May 2023 01:02:21 -0500 Subject: fix panic on disconnect --- azalea-client/src/local_player.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'azalea-client/src/local_player.rs') diff --git a/azalea-client/src/local_player.rs b/azalea-client/src/local_player.rs index 423b4308..691f9ced 100644 --- a/azalea-client/src/local_player.rs +++ b/azalea-client/src/local_player.rs @@ -139,9 +139,10 @@ pub fn update_in_loaded_chunk( ) { for (entity, local_player, position) in &query { let player_chunk_pos = ChunkPos::from(position); - let instance_lock = instance_container - .get(local_player) - .expect("local player should always be in an instance"); + let Some(instance_lock) = instance_container.get(local_player) else { + continue; + }; + let in_loaded_chunk = instance_lock.read().chunks.get(&player_chunk_pos).is_some(); if in_loaded_chunk { commands.entity(entity).insert(LocalPlayerInLoadedChunk); -- cgit v1.2.3