aboutsummaryrefslogtreecommitdiff
path: root/azalea-physics/src
diff options
context:
space:
mode:
Diffstat (limited to 'azalea-physics/src')
-rw-r--r--[-rwxr-xr-x]azalea-physics/src/collision/mod.rs0
-rw-r--r--azalea-physics/src/collision/world_collisions.rs4
-rw-r--r--[-rwxr-xr-x]azalea-physics/src/lib.rs10
3 files changed, 11 insertions, 3 deletions
diff --git a/azalea-physics/src/collision/mod.rs b/azalea-physics/src/collision/mod.rs
index 7fb2cf97..7fb2cf97 100755..100644
--- a/azalea-physics/src/collision/mod.rs
+++ b/azalea-physics/src/collision/mod.rs
diff --git a/azalea-physics/src/collision/world_collisions.rs b/azalea-physics/src/collision/world_collisions.rs
index 65f7f5bb..a4062fcc 100644
--- a/azalea-physics/src/collision/world_collisions.rs
+++ b/azalea-physics/src/collision/world_collisions.rs
@@ -57,7 +57,7 @@ impl<'a> BlockCollisions<'a> {
}
}
- fn get_chunk(&self, block_x: i32, block_z: i32) -> Option<&Arc<Mutex<Chunk>>> {
+ fn get_chunk(&self, block_x: i32, block_z: i32) -> Option<Arc<Mutex<Chunk>>> {
let chunk_x = ChunkSectionPos::block_to_section_coord(block_x);
let chunk_z = ChunkSectionPos::block_to_section_coord(block_z);
let chunk_pos = ChunkPos::new(chunk_x, chunk_z);
@@ -75,7 +75,7 @@ impl<'a> BlockCollisions<'a> {
// return var7;
// }
- self.world[&chunk_pos].as_ref()
+ self.world.get_chunk(&chunk_pos)
}
}
diff --git a/azalea-physics/src/lib.rs b/azalea-physics/src/lib.rs
index 2295e6f2..34d31a0e 100755..100644
--- a/azalea-physics/src/lib.rs
+++ b/azalea-physics/src/lib.rs
@@ -231,7 +231,10 @@ fn jump_boost_power<D: DerefMut<Target = World>>(_entity: &Entity<D>) -> f64 {
mod tests {
use super::*;
use azalea_core::ChunkPos;
- use azalea_world::{Chunk, World};
+ use azalea_world::{
+ entity::{metadata, EntityMetadata},
+ Chunk, World,
+ };
use uuid::Uuid;
#[test]
@@ -247,6 +250,7 @@ mod tests {
y: 70.,
z: 0.,
},
+ EntityMetadata::Player(metadata::Player::default()),
),
);
let mut entity = world.entity_mut(0).unwrap();
@@ -279,6 +283,7 @@ mod tests {
y: 70.,
z: 0.5,
},
+ EntityMetadata::Player(metadata::Player::default()),
),
);
let block_state = world.set_block_state(&BlockPos { x: 0, y: 69, z: 0 }, BlockState::Stone);
@@ -311,6 +316,7 @@ mod tests {
y: 71.,
z: 0.5,
},
+ EntityMetadata::Player(metadata::Player::default()),
),
);
let block_state = world.set_block_state(
@@ -344,6 +350,7 @@ mod tests {
y: 71.,
z: 0.5,
},
+ EntityMetadata::Player(metadata::Player::default()),
),
);
let block_state = world.set_block_state(
@@ -377,6 +384,7 @@ mod tests {
y: 73.,
z: 0.5,
},
+ EntityMetadata::Player(metadata::Player::default()),
),
);
let block_state = world.set_block_state(