diff options
| author | mat <git@matdoes.dev> | 2025-02-22 23:01:54 +0000 |
|---|---|---|
| committer | mat <git@matdoes.dev> | 2025-02-22 23:01:54 +0000 |
| commit | 34f53baf85fb5c7163ec5d71a8ab9d45d3f271b6 (patch) | |
| tree | 7920fec1203e8e96463a142f5f6da6164e76e684 /azalea-physics/src/collision/world_collisions.rs | |
| parent | bdd2fc91e11e2896d8e1c7046df247e1075bd40d (diff) | |
| download | azalea-drasl-34f53baf85fb5c7163ec5d71a8ab9d45d3f271b6.tar.xz | |
update to rust edition 2024
Diffstat (limited to 'azalea-physics/src/collision/world_collisions.rs')
| -rw-r--r-- | azalea-physics/src/collision/world_collisions.rs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/azalea-physics/src/collision/world_collisions.rs b/azalea-physics/src/collision/world_collisions.rs index f0b41986..3aede743 100644 --- a/azalea-physics/src/collision/world_collisions.rs +++ b/azalea-physics/src/collision/world_collisions.rs @@ -9,8 +9,8 @@ use azalea_core::{ use azalea_world::{Chunk, Instance}; use parking_lot::RwLock; -use super::{Shapes, BLOCK_SHAPE}; -use crate::collision::{BlockWithShape, VoxelShape, AABB}; +use super::{BLOCK_SHAPE, Shapes}; +use crate::collision::{AABB, BlockWithShape, VoxelShape}; pub fn get_block_collisions(world: &Instance, aabb: AABB) -> Vec<VoxelShape> { let mut state = BlockCollisionsState::new(world, aabb); @@ -27,12 +27,11 @@ pub fn get_block_collisions(world: &Instance, aabb: AABB) -> Vec<VoxelShape> { let item_chunk_pos = ChunkPos::from(item.pos); let block_state: BlockState = if item_chunk_pos == initial_chunk_pos { - if let Some(initial_chunk) = &initial_chunk { - initial_chunk + match &initial_chunk { + Some(initial_chunk) => initial_chunk .get(&ChunkBlockPos::from(item.pos), state.world.chunks.min_y) - .unwrap_or(BlockState::AIR) - } else { - BlockState::AIR + .unwrap_or(BlockState::AIR), + _ => BlockState::AIR, } } else { state.get_block_state(item.pos) |
