From e99e12fd5487f9a16dfaf9330a980cd5d900b0f9 Mon Sep 17 00:00:00 2001
From: Firelop <49453048+firelop@users.noreply.github.com>
Date: Sun, 6 Jul 2025 21:46:37 +0200
Subject: [PATCH] Fixed weird behavior of fall damage when player is in water
 #507 (#882)

* Reset fall distance for entities in water or powder snow

* Fixed formatting

* F*** ing semicolon

* Removed useless mut
---
 pumpkin/src/entity/living.rs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pumpkin/src/entity/living.rs b/pumpkin/src/entity/living.rs
index 383ee5ccb..77ecd8a83 100644
--- a/pumpkin/src/entity/living.rs
+++ b/pumpkin/src/entity/living.rs
@@ -239,9 +239,16 @@ impl LivingEntity {
                     .await;
             }
         } else if height_difference < 0.0 {
-            let distance = self.fall_distance.load();
-            self.fall_distance
-                .store(distance - (height_difference as f32));
+            let new_fall_distance = if !self.is_in_water().await && !self.is_in_powder_snow().await
+            {
+                let distance = self.fall_distance.load();
+                distance - (height_difference as f32)
+            } else {
+                0f32
+            };
+
+            // Reset fall distance if is in water or powder_snow
+            self.fall_distance.store(new_fall_distance);
         }
     }