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

Fixed water collision bug

Browse Source
This commit is contained in:
Joshua Barretto 2021-03-12 15:38:48 +00:00
parent 2c1c07c6b8
commit 069f259315
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -647,6 +647,7 @@ impl<'a> PhysicsSystemData<'a> {
match (physics_state.in_liquid, physics_state_delta.in_liquid) { match (physics_state.in_liquid, physics_state_delta.in_liquid) {
// this match computes `x <|> y <|> liftA2 max x y` // this match computes `x <|> y <|> liftA2 max x y`
(Some(x), Some(y)) => Some(x.max(y)), (Some(x), Some(y)) => Some(x.max(y)),
(x @ Some(_), _) => x,
(_, y @ Some(_)) => y, (_, y @ Some(_)) => y,
_ => None, _ => None,
}; };