From db7d5a777159b7cfecf7ef7cca54a157a2408142 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Fri, 12 Mar 2021 15:38:48 +0000
Subject: [PATCH] Fixed water collision bug

---
 common/sys/src/phys.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/sys/src/phys.rs b/common/sys/src/phys.rs
index 501714daf6..99ed590750 100644
--- a/common/sys/src/phys.rs
+++ b/common/sys/src/phys.rs
@@ -658,6 +658,7 @@ impl<'a> PhysicsSystemData<'a> {
                                     match (physics_state.in_liquid, physics_state_delta.in_liquid) {
                                         // this match computes `x <|> y <|> liftA2 max x y`
                                         (Some(x), Some(y)) => Some(x.max(y)),
+                                        (x @ Some(_), _) => x,
                                         (_, y @ Some(_)) => y,
                                         _ => None,
                                     };