Stupid Idiot Fixes Another Horrible Movement Bug

Author: Ghostipedia

src/main/java/com/ghostipedia/cosmiccore/common/reflection/bargain/impl/QuakeMovementHandler.java

@@ -41,12 +41,13 @@ public class QuakeMovementHandler {
     private static final double GROUND_ACCELERATE = 15.0;
     private static final double AIR_ACCELERATE = 200.0;
     private static final double AIR_WISH_SPEED = 0.25;
-    private static final double BHOP_BOOST = 1.18;
+    private static final double BHOP_BOOST = 1.12;
     private static final double HARD_CAP_SPEED = 1.25;    // 25 b/s
     private static final double BHOP_SOFT_CAP = 0.5;      // 10 b/s - pure bhop caps here
     private static final double SOFT_CAP_SPEED = 1.0;     // 20 b/s
     private static final double SOFT_CAP_DEGEN = 0.7;
     private static final double MIN_BHOP_SPEED = 0.10;
+    private static final int MIN_BHOP_AIRTIME = 5;
     private static final double TRIMP_MULTIPLIER = 1.6;
 
     // Debug
@@ -124,17 +125,20 @@ public static void onPlayerTick(TickEvent.PlayerTickEvent event) {
             wasJumping.put(uuid, false);
         }
 
-        // Bhop on landing
+        // Bhop on landing (requires minimum airtime to filter stair/step spam)
         if (onGround && !wasGrounded && horizontalSpeed > MIN_BHOP_SPEED) {
-            double oldSpeed = horizontalSpeed;
-            motion = applyBunnyHop(player, motion, horizontalSpeed);
-            player.setDeltaMovement(motion);
-            double newSpeed = getHorizontalSpeed(motion);
-            horizontalSpeed = newSpeed;
+            int air = airTime.getOrDefault(uuid, 0);
+            if (air >= MIN_BHOP_AIRTIME) {
+                double oldSpeed = horizontalSpeed;
+                motion = applyBunnyHop(player, motion, horizontalSpeed);
+                player.setDeltaMovement(motion);
+                double newSpeed = getHorizontalSpeed(motion);
+                horizontalSpeed = newSpeed;
 
-            if (newSpeed > oldSpeed) {
-                spawnBhopParticles(player, 4);
-                if (DEBUG_MODE) lastBhopTick = player.tickCount;
+                if (newSpeed > oldSpeed) {
+                    spawnBhopParticles(player, 4);
+                    if (DEBUG_MODE) lastBhopTick = player.tickCount;
+                }
             }
         }
 
@@ -176,7 +180,9 @@ private static Vec3 applyBunnyHop(Player player, Vec3 motion, double currentSpee
         double targetSpeed = currentSpeed;
 
         if (currentSpeed < SOFT_CAP_SPEED) {
-            double boostedSpeed = currentSpeed * BHOP_BOOST;
+            double speedRatio = Math.min(currentSpeed / BHOP_SOFT_CAP, 1.0);
+            double dynamicMultiplier = 1.0 + (BHOP_BOOST - 1.0) * (1.0 - speedRatio * speedRatio);
+            double boostedSpeed = currentSpeed * dynamicMultiplier;
             if (boostedSpeed > SOFT_CAP_SPEED) {
                 double excess = boostedSpeed - SOFT_CAP_SPEED;
                 boostedSpeed = SOFT_CAP_SPEED + excess * SOFT_CAP_DEGEN;

src/main/java/com/ghostipedia/cosmiccore/mixin/quake/QuakeMovementMixin.java

@@ -131,9 +131,20 @@ public abstract class QuakeMovementMixin {
         if (Math.abs(targetSpeed - postSpeed) < 0.001) return;
 
         if (postSpeed > 0.001) {
-            double scale = targetSpeed / postSpeed;
-            player.setDeltaMovement(postVel.x * scale, postVel.y, postVel.z * scale);
-        } else if (preSpeed > 0.001) {
+            double effectiveTarget = targetSpeed;
+
+            if (player.horizontalCollision && preSpeed > 0.001) {
+                double dot = (preVel.x / preSpeed) * (postVel.x / postSpeed) +
+                        (preVel.z / preSpeed) * (postVel.z / postSpeed);
+                dot = Math.max(dot, 0.0);
+                effectiveTarget = targetSpeed * dot;
+            }
+
+            if (effectiveTarget > 0.001) {
+                double scale = effectiveTarget / postSpeed;
+                player.setDeltaMovement(postVel.x * scale, postVel.y, postVel.z * scale);
+            }
+        } else if (preSpeed > 0.001 && !player.horizontalCollision) {
             double scale = targetSpeed / preSpeed;
             player.setDeltaMovement(preVel.x * scale, postVel.y, preVel.z * scale);
         }