Merge branch 'imbris/fix-nan' into 'master'

Fix check before calculating entity pushback, was causing a NaN and probably other bugs See merge request veloren/veloren!2647
2024-08-30 18:12:32 +00:00 · 2021-07-19 07:35:14 +00:00 · 2021-07-19 07:35:14 +00:00 · e11be27738
commit e11be27738
parent cee4dccb44 d2b8a5a169
1 changed files with 2 additions and 2 deletions
--- a/common/systems/src/phys.rs
+++ b/common/systems/src/phys.rs
@ -439,8 +439,8 @@ impl<'a> PhysicsData<'a> {
                                        // Don't apply force when entity is a sticky which is on the
                                        // ground (or on the wall)
                                        if !forced_movement
-                                            && !is_sticky
-                                            || is_mid_air
+                                            && (!is_sticky
+                                            || is_mid_air)
                                            && diff.magnitude_squared() > 0.0
                                            && !is_projectile
                                            && !matches!(collider_other,Some(Collider::Voxel { .. }))