mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Fixed broken arrow physics
This commit is contained in:
parent
49d1b3df6d
commit
112b11c951
@ -619,7 +619,7 @@ impl<'a> System<'a> for Sys {
|
|||||||
},
|
},
|
||||||
Collider::Point => {
|
Collider::Point => {
|
||||||
let (dist, block) = terrain.ray(pos.0, pos.0 + pos_delta)
|
let (dist, block) = terrain.ray(pos.0, pos.0 + pos_delta)
|
||||||
.until(|vox| !vox.is_air() && !vox.is_fluid())
|
.until(|vox| !vox.is_air() && !vox.is_liquid())
|
||||||
.ignore_error().cast();
|
.ignore_error().cast();
|
||||||
|
|
||||||
pos.0 += pos_delta.try_normalized().unwrap_or(Vec3::zero()) * dist;
|
pos.0 += pos_delta.try_normalized().unwrap_or(Vec3::zero()) * dist;
|
||||||
@ -655,7 +655,7 @@ impl<'a> System<'a> for Sys {
|
|||||||
|
|
||||||
physics_state.in_fluid = terrain.get(pos.0.map(|e| e.floor() as i32))
|
physics_state.in_fluid = terrain.get(pos.0.map(|e| e.floor() as i32))
|
||||||
.ok()
|
.ok()
|
||||||
.and_then(|vox| vox.is_fluid().then_some(1.0));
|
.and_then(|vox| vox.is_liquid().then_some(1.0));
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user