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

Fix water

Browse Source
This commit is contained in:
timokoesters 2019-08-24 11:04:32 +02:00
parent 5ab03abbdd
commit 0bb70d8182
No known key found for this signature in database
GPG Key ID: CD80BE9AAEE78097
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,7 +104,7 @@ impl<'a> System<'a> for Sys {
if terrain
.get(block_pos)
.map(|vox| !vox.is_empty())
.map(|vox| vox.is_solid())
.unwrap_or(false)
{
let player_aabb = Aabb {
@ -179,7 +179,7 @@ impl<'a> System<'a> for Sys {
.filter(|(block_pos, _)| {
terrain
.get(*block_pos)
.map(|vox| !vox.is_empty())
.map(|vox| vox.is_solid())
.unwrap_or(false)
})
// Find the maximum of the minimum collision axes (this bit is weird, trust me that it works)
@ -225,7 +225,7 @@ impl<'a> System<'a> for Sys {
// ...and we're falling/standing OR there is a block *directly* beneath our current origin (note: not hitbox)...
&& (vel.0.z <= 0.0 || terrain
.get((pos.0 - Vec3::unit_z() * 0.1).map(|e| e.floor() as i32))
.map(|vox| !vox.is_empty())
.map(|vox| vox.is_solid())
.unwrap_or(false))
// ...and there is a collision with a block beneath our current hitbox...
&& collision_with(