diff options
| author | mat <git@matdoes.dev> | 2024-02-17 14:43:42 -0600 |
|---|---|---|
| committer | mat <git@matdoes.dev> | 2024-02-17 14:43:42 -0600 |
| commit | be4f13c36c281f086602092098522b3f25fc0680 (patch) | |
| tree | 599d2de84d06d7d1c31a908a2e89499c62e0a5ca /azalea/src | |
| parent | 64d48897afe5bcb40931f8ef8b3594fe275751e8 (diff) | |
| download | azalea-drasl-be4f13c36c281f086602092098522b3f25fc0680.tar.xz | |
upgrade deps, bevy 0.13
Diffstat (limited to 'azalea/src')
| -rw-r--r-- | azalea/src/nearest_entity.rs | 6 | ||||
| -rw-r--r-- | azalea/src/pathfinder/world.rs | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/azalea/src/nearest_entity.rs b/azalea/src/nearest_entity.rs index 38c9886e..363c8fb0 100644 --- a/azalea/src/nearest_entity.rs +++ b/azalea/src/nearest_entity.rs @@ -2,7 +2,7 @@ use azalea_entity::Position; use azalea_world::{InstanceName, MinecraftEntityId}; use bevy_ecs::{ prelude::Entity, - query::{ReadOnlyWorldQuery, With}, + query::{QueryFilter, With}, system::{Query, SystemParam}, }; @@ -44,7 +44,7 @@ use bevy_ecs::{ #[derive(SystemParam)] pub struct EntityFinder<'w, 's, F = ()> where - F: ReadOnlyWorldQuery + 'static, + F: QueryFilter + 'static, { all_entities: Query<'w, 's, (&'static Position, &'static InstanceName), With<MinecraftEntityId>>, @@ -59,7 +59,7 @@ where impl<'w, 's, 'a, F> EntityFinder<'w, 's, F> where - F: ReadOnlyWorldQuery + 'static, + F: QueryFilter + 'static, { /// Gets the nearest entity to the given position and world instance name. /// This method will return `None` if there are no entities within range. If diff --git a/azalea/src/pathfinder/world.rs b/azalea/src/pathfinder/world.rs index a5a273fb..d3c94a52 100644 --- a/azalea/src/pathfinder/world.rs +++ b/azalea/src/pathfinder/world.rs @@ -157,9 +157,7 @@ impl CachedWorld { } let world = self.world_lock.read(); - let Some(chunk) = world.chunks.get(&chunk_pos) else { - return None; - }; + let chunk = world.chunks.get(&chunk_pos)?; let chunk = chunk.read(); let sections: Vec<azalea_world::palette::PalettedContainer> = chunk |
