Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved climbing, block-hopping on airships

Browse Source
This commit is contained in:
Joshua Barretto
2021-03-15 00:23:06 +00:00
committed by Avi Weinstock
parent 546ee48073
commit 1e9ee3d243
2 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/sys/src/phys.rs
View File

@ -1039,13 +1039,12 @@ fn cylinder_voxel_collision<'a, T: BaseVol<Vox = Block> + ReadVol>(
// ...and we're being pushed out horizontally...
&& resolve_dir.z == 0.0
// ...and the vertical resolution direction is sufficiently great...
&& -dir.z > 0.1
&& was_on_ground
// // ...and we're falling/standing OR there is a block *directly* beneath our current origin (note: not hitbox)...
// && (vel.0.z <= 0.0 || terrain
&& dir.z < -0.1
// ...and we're falling/standing OR there is a block *directly* beneath our current origin (note: not hitbox)...
// && terrain
// .get((pos.0 - Vec3::unit_z() * 0.1).map(|e| e.floor() as i32))
// .map(|block| block.is_solid())
// .unwrap_or(false))
// .unwrap_or(false)
// ...and there is a collision with a block beneath our current hitbox...
&& collision_with(
pos.0 + resolve_dir - Vec3::unit_z() * 1.25,
@ -1129,8 +1128,8 @@ fn cylinder_voxel_collision<'a, T: BaseVol<Vox = Block> + ReadVol>(
&terrain,
block_true,
near_iter.clone(),
radius + 0.05,
z_range.start - 0.05..z_range.end + 0.05,
radius,
z_range.clone(),
) {
(a + dir, true)
} else {