Skip rest of movement attempt when motion already cancelled

CaffeineMC · Jun 8, 2024 · 3e0e24c · 3e0e24c
1 parent 5e4fa7a
commit 3e0e24c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/main/java/me/jellysquid/mods/lithium/mixin/entity/collisions/movement/EntityMixin.java b/src/main/java/me/jellysquid/mods/lithium/mixin/entity/collisions/movement/EntityMixin.java
@@ -96,6 +96,10 @@ public static Vec3d adjustMovementForCollisions(@Nullable Entity entity, Vec3d m
             if (voxelShape != null) {
                 double v = voxelShape.calculateMaxDistance(Direction.Axis.Y, entityBoundingBox, movementY);
                 if (v == 0) {
+                    if (isSingleAxisMovement) {
+                        //Y was the only movement axis, movement completely cancelled<
+                        return Vec3d.ZERO;
+                    }
                     movementY = 0D;
                     isSingleAxisMovement = (movementX == 0D ? 0 : 1) + (movementZ == 0D ? 0 : 1) == 1;
                 }