Skip to content

Commit 8626e81

Browse files
fix: align with java entity water velocity (#1716) (#1739)
Signed-off-by: Joseph Rimmer <4097668+yuminstalljoe@users.noreply.github.com>
1 parent 6d069a8 commit 8626e81

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

pumpkin/src/entity/living.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ impl LivingEntity {
880880

881881
async fn travel_in_fluid(&self, caller: Arc<dyn EntityBase>, water: bool) {
882882
let movement_input = self.movement_input.load();
883-
let y0 = self.entity.pos.load().y;
883+
884884
let falling = self.entity.velocity.load().y <= 0.0;
885885
let gravity = self.get_effective_gravity(&caller).await;
886886
let effective_speed = self.get_attribute_value(&Attributes::MOVEMENT_SPEED);
@@ -951,8 +951,6 @@ impl LivingEntity {
951951

952952
let mut velo = self.entity.velocity.load();
953953

954-
velo.y += 0.6 - self.entity.pos.load().y + y0;
955-
956954
if self.entity.horizontal_collision.load(SeqCst)
957955
&& !self
958956
.entity

0 commit comments

Comments
 (0)