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

Added patch for sticky hitboxes

Browse Source
This commit is contained in:
Joshua Barretto 2021-03-29 21:50:50 +01:00
parent 85237c7a32
commit ead861e509
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -731,11 +731,19 @@ impl<'a> PhysicsData<'a> {
climbing,
|entity, vel| land_on_ground = Some((entity, vel)),
);
// Sticky things shouldn't move when on a surface
if physics_state.on_surface().is_some() && sticky.is_some() {
vel.0 = physics_state.ground_vel;
}
tgt_pos = cpos.0;
},
Collider::Point => {
let mut pos = *pos;
// If the velocity is exactly 0, a raycast may not pick up the current
// block. Handle this.
let (dist, block) = if let Some(block) = read
.terrain
.get(pos.0.map(|e| e.floor() as i32))
@ -803,7 +811,7 @@ impl<'a> PhysicsData<'a> {
// Sticky things shouldn't move
if sticky.is_some() {
vel.0 = Vec3::zero();
vel.0 = physics_state.ground_vel;
}
}