From 5a9acd3c3efb09e7f4fee9168ed9a859dd312eda Mon Sep 17 00:00:00 2001 From: Bixilon Date: Mon, 28 Jun 2021 22:01:23 +0200 Subject: [PATCH] fix wrong water speed --- .../de/bixilon/minosoft/data/player/LocalPlayerEntity.kt | 7 ++++--- .../minosoft/data/registries/fluid/water/WaterFluid.kt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/data/player/LocalPlayerEntity.kt b/src/main/java/de/bixilon/minosoft/data/player/LocalPlayerEntity.kt index 5088f2389..695ce7de7 100644 --- a/src/main/java/de/bixilon/minosoft/data/player/LocalPlayerEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/player/LocalPlayerEntity.kt @@ -45,7 +45,6 @@ import de.bixilon.minosoft.gui.rendering.chunk.models.AABB import de.bixilon.minosoft.gui.rendering.input.camera.MovementInput import de.bixilon.minosoft.gui.rendering.util.VecUtil import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY -import de.bixilon.minosoft.gui.rendering.util.VecUtil.assign import de.bixilon.minosoft.gui.rendering.util.VecUtil.blockPosition import de.bixilon.minosoft.gui.rendering.util.VecUtil.chunkPosition import de.bixilon.minosoft.gui.rendering.util.VecUtil.clearZero @@ -597,11 +596,13 @@ class LocalPlayerEntity( } if (abs(this.velocity.x) < 0.003 && abs(this.velocity.z) < 0.003 && velocity.length() < 0.0045000000000000005) { - velocity assign (velocity.normalize() * 0.0045000000000000005) + velocity.normalizeAssign() + velocity *= 0.0045000000000000005 } - this.velocity assign (this.velocity + velocity) + this.velocity = (this.velocity + velocity) } + if (height > 0.0) { fluidHeights[fluid] = height } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/fluid/water/WaterFluid.kt b/src/main/java/de/bixilon/minosoft/data/registries/fluid/water/WaterFluid.kt index dbce2220b..397f197c3 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/fluid/water/WaterFluid.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/fluid/water/WaterFluid.kt @@ -67,7 +67,7 @@ class WaterFluid( override fun travel(entity: LocalPlayerEntity, sidewaysSpeed: Float, forwardSpeed: Float, gravity: Double, falling: Boolean) { val y = entity.position.y - var speedMultiplier = entity.isSprinting.decide(0.9, entity.walkingSpeed) + var speedMultiplier = entity.isSprinting.decide(0.9, 0.8) var depthStriderLevel = min(entity.getEquipmentEnchant(depthStriderEnchantment), 3).toDouble()