From 191155315b2c8fe35a214406d6399c1677093c9e Mon Sep 17 00:00:00 2001
From: Murat65536 <bob65536@proton.me>
Date: Sun, 6 Jul 2025 20:25:02 -0400
Subject: [PATCH] Keep original player movement.

---
 .../pathing/movement/MovementHelper.java      | 27 ++++++-------------
 .../movement/movements/MovementTraverse.java  |  5 +---
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/main/java/baritone/pathing/movement/MovementHelper.java b/src/main/java/baritone/pathing/movement/MovementHelper.java
index 935cb9eb9..ed197acd9 100644
--- a/src/main/java/baritone/pathing/movement/MovementHelper.java
+++ b/src/main/java/baritone/pathing/movement/MovementHelper.java
@@ -661,17 +661,6 @@ public interface MovementHelper extends ActionCosts, Helper {
 
     static void moveTowardsWithRotation(IPlayerContext ctx, MovementState state, BlockPos dest, Rotation rotation) {
         state.setTarget(new MovementTarget(rotation, true));
-        /*
-        Options:
-        W: ax, az
-        S: -ax,-az
-        A: -az,ax
-        D: az,-ax
-        W+A:ax-az,az+ax,
-        W+D:ax+az,az-ax,
-        S+A:-ax-az,-az+ax,
-        S+D:-ax+az,-az-ax
-        */
         boolean canSprint = Baritone.settings().allowSprint.value;
         float ax = Mth.sin((float)Math.toRadians(ctx.playerRotations().getYaw()));
         float az = Mth.cos((float)Math.toRadians(ctx.playerRotations().getYaw()));
@@ -681,14 +670,14 @@ public interface MovementHelper extends ActionCosts, Helper {
         float targetAx = Mth.sin((float)Math.toRadians(blockRotation.getYaw()));
         float targetAz = Mth.cos((float)Math.toRadians(blockRotation.getYaw()));
         float[][] options = {
-                {canSprint ? ax * 1.3f : ax, canSprint ? az * 1.3f : az},
-                {-ax, -az},
-                {-az, az},
-                {az, -ax},
-                {(canSprint ? ax * 1.3f : ax) - az, (canSprint ? az * 1.3f : az) + ax},
-                {(canSprint ? ax * 1.3f : ax) + az, (canSprint ? az * 1.3f : az) - ax},
-                {-ax - az, -az + ax},
-                {-ax + az, -az - ax}
+                {canSprint ? ax * 1.3f : ax, canSprint ? az * 1.3f : az}, // W
+                {-ax, -az}, // S
+                {-az, az}, // A
+                {az, -ax}, // D
+                {(canSprint ? ax * 1.3f : ax) - az, (canSprint ? az * 1.3f : az) + ax}, // W+A
+                {(canSprint ? ax * 1.3f : ax) + az, (canSprint ? az * 1.3f : az) - ax}, // W+D
+                {-ax - az, -az + ax}, // S+A
+                {-ax + az, -az - ax} // S+D
         };
         int selection = -1;
         float closestX = 100000;
diff --git a/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java b/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java
index c973b8e97..8b605810f 100644
--- a/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java
+++ b/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java
@@ -352,10 +352,7 @@ public class MovementTraverse extends Movement {
                 }
                 return state;
             }
-            MovementHelper.moveTowardsWithRotation(ctx, state, dest,
-                    RotationUtils.calcRotationFromVec3d(ctx.playerHead(),
-                            VecUtils.getBlockPosCenter(dest),
-                    ctx.playerRotations()).add(new Rotation(45, 0).withPitch(ctx.playerRotations().getPitch())));
+            MovementHelper.moveTowardsWithRotation(ctx, state, dest, ctx.playerRotations());
             return state;
             // TODO MovementManager.moveTowardsBlock(to); // move towards not look at because if we are bridging for a couple blocks in a row, it is faster if we dont spin around and walk forwards then spin around and place backwards for every block
         }