From d253e9461e1b8130e226b902340cb295de04b09b Mon Sep 17 00:00:00 2001
From: Dmitry Poyarkov <dimonpo96@mail.ru>
Date: Mon, 18 Mar 2024 12:48:55 +0400
Subject: [PATCH] fix: acceleration in motion

---
 .idea/codeStyles/Project.xml                              | 3 +++
 .../server/world/service/AllayEntityPhysicsService.java   | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index ffd7346964..47e66e82d7 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,6 +3,9 @@
     <JavaCodeStyleSettings>
       <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="10" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="10" />
+      <option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" />
+      <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />
+      <option name="JD_KEEP_INVALID_TAGS" value="false" />
     </JavaCodeStyleSettings>
     <codeStyleSettings language="JAVA">
       <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
diff --git a/Allay-Server/src/main/java/org/allaymc/server/world/service/AllayEntityPhysicsService.java b/Allay-Server/src/main/java/org/allaymc/server/world/service/AllayEntityPhysicsService.java
index 36cf62e303..8ec0cee192 100644
--- a/Allay-Server/src/main/java/org/allaymc/server/world/service/AllayEntityPhysicsService.java
+++ b/Allay-Server/src/main/java/org/allaymc/server/world/service/AllayEntityPhysicsService.java
@@ -198,12 +198,12 @@ protected void computeEntityCollisionMotion(Entity entity) {
             var ol = other.getLocation();
             var direction = new Vector3f(entity.getLocation()).sub(other.getLocation(), new Vector3f()).normalize();
             float distance = max(abs(ol.x() - loc.x()), abs(ol.z() - loc.z()));
-            float k;
+            float k = 0.05f * r;
             if (distance <= 0.01) continue;
             if (distance <= 1) {
-                k = (0.05f * r) * MathUtils.fastFloatInverseSqrt(distance);
+                k *= MathUtils.fastFloatInverseSqrt(distance);
             } else {
-                k = (0.05f * r) / distance;
+                k /= distance;
             }
             collisionMotion.add(direction.mul(k));
         }
@@ -235,7 +235,7 @@ protected void updateMotion(Entity entity) {
         var velocityFactor = entity.isOnGround() ? GROUND_VELOCITY_FACTOR : AIR_VELOCITY_FACTOR;
         var acceleration = velocityFactor * movementFactor;
         if (entity.isOnGround()) {
-            acceleration = (float) (movementFactor * effectFactor * Math.pow(DEFAULT_FRICTION / slipperinessMultiplier, 3));
+            acceleration *= (float) (effectFactor * Math.pow(DEFAULT_FRICTION / slipperinessMultiplier, 3));
         }
 
         var yaw = entity.getLocation().yaw();