majjo/Pumpkin
1
0
Fork 0
mirror of https://github.com/Pumpkin-MC/Pumpkin.git synced 2026-08-31 08:22:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed weird behavior of fall damage when player is in water #507 (#882)

Browse Source 
* Reset fall distance for entities in water or powder snow

* Fixed formatting

* F*** ing semicolon

* Removed useless mut
This commit is contained in:
Firelop
2025-07-06 21:46:37 +02:00
committed by GitHub
parent c80dfcbf0b
commit e99e12fd54
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pumpkin/src/entity/living.rs
View File

@@ -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);
}
}