fix: movement speed calculate

AllayMC · Jun 29, 2024 · 9c61e46 · 9c61e46
1 parent 44beeba
commit 9c61e46
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/...-API/src/main/java/org/allaymc/api/entity/component/player/EntityPlayerBaseComponent.java b/...-API/src/main/java/org/allaymc/api/entity/component/player/EntityPlayerBaseComponent.java
@@ -20,7 +20,9 @@
 
 public interface EntityPlayerBaseComponent extends EntityBaseComponent, ChunkLoader, ScoreboardViewer {
 
-    double BLOCK_INTERACT_MAX_DV_DIFF = 2.0;
+    double BLOCK_INTERACT_MAX_DV_DIFF = 2d;
+
+    float DEFAULT_MOVEMENT_SPEED = 0.1f;
 
     boolean isSprinting();
 
@@ -147,9 +149,7 @@ default double getMaxInteractDistance() {
         return getGameType() == GameType.CREATIVE ? 13 : 7;
     }
 
-    float DEFAULT_MOVEMENT_SPEED = 0.1f;
+    float getMovementSpeed();
 
     void setMovementSpeed(float speed);
-
-    float getMovementSpeed();
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSlownessType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSlownessType.java
@@ -23,13 +23,18 @@ private EffectSlownessType() {
     @Override
     public void onAdd(Entity entity, EffectInstance effectInstance) {
         if (!(entity instanceof EntityPlayer player)) return;
-        var amplifier = effectInstance.getAmplifier();
-        player.setMovementSpeed(EntityPlayer.DEFAULT_MOVEMENT_SPEED * (1 - 0.15f * (amplifier + 1)));
+        var amplifier = effectInstance.getAmplifier() + 1;
+        var slowness = 1 - amplifier * 0.15f;
+        if (slowness <= 0) slowness = 0.00001f;
+        player.setMovementSpeed(player.getMovementSpeed() * slowness);
     }
 
     @Override
     public void onRemove(Entity entity, EffectInstance effectInstance) {
         if (!(entity instanceof EntityPlayer player)) return;
-        player.setMovementSpeed(EntityPlayer.DEFAULT_MOVEMENT_SPEED);
+        var amplifier = effectInstance.getAmplifier() + 1;
+        var slowness = 1 - amplifier * 0.15f;
+        if (slowness <= 0) slowness = 0.00001f;
+        player.setMovementSpeed(player.getMovementSpeed() / slowness);
     }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSpeedType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSpeedType.java
@@ -5,7 +5,6 @@
 import org.allaymc.api.entity.effect.EffectInstance;
 import org.allaymc.api.entity.interfaces.EntityPlayer;
 import org.allaymc.api.utils.Identifier;
-import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
 
 import java.awt.*;
 
@@ -24,13 +23,16 @@ private EffectSpeedType() {
     @Override
     public void onAdd(Entity entity, EffectInstance effectInstance) {
         if (!(entity instanceof EntityPlayer player)) return;
-        var amplifier = effectInstance.getAmplifier();
-        player.setMovementSpeed(EntityPlayer.DEFAULT_MOVEMENT_SPEED * (1 + 0.2f * (amplifier + 1)));
+        var amplifier = effectInstance.getAmplifier() + 1;
+        var speed = 1 + amplifier * 0.2f;
+        player.setMovementSpeed(player.getMovementSpeed() * speed);
     }
 
     @Override
     public void onRemove(Entity entity, EffectInstance effectInstance) {
         if (!(entity instanceof EntityPlayer player)) return;
-        player.setMovementSpeed(EntityPlayer.DEFAULT_MOVEMENT_SPEED);
+        var amplifier = effectInstance.getAmplifier() + 1;
+        var speed = 1 + amplifier * 0.2f;
+        player.setMovementSpeed(player.getMovementSpeed() / speed);
     }
 }
diff --git a/...c/main/java/org/allaymc/server/entity/component/player/EntityPlayerBaseComponentImpl.java b/...c/main/java/org/allaymc/server/entity/component/player/EntityPlayerBaseComponentImpl.java
@@ -284,6 +284,14 @@ public boolean isSprinting() {
 
     @Override
     public void setSprinting(boolean sprinting) {
+        if (sprinting == isSprinting()) return;
+
+        var speed = getMovementSpeed();
+        if (sprinting) speed *= 1.3f;
+        else speed /= 1.3f;
+
+        setMovementSpeed(speed);
+
         setAndSendEntityFlag(EntityFlag.SPRINTING, sprinting);
     }