diff --git a/sakura-server/minecraft-patches/features/0026-Optimise-check-inside-blocks-and-traverse-blocks.patch b/sakura-server/minecraft-patches/features/0026-Optimise-check-inside-blocks-and-traverse-blocks.patch
index 0aed5f1..5ffafec 100644
--- a/sakura-server/minecraft-patches/features/0026-Optimise-check-inside-blocks-and-traverse-blocks.patch
+++ b/sakura-server/minecraft-patches/features/0026-Optimise-check-inside-blocks-and-traverse-blocks.patch
@@ -81,7 +81,7 @@ index 5aa283ac6eb9f3690f9df1938ac08da77d29142e..438013200908d3cdb0677b551c3890c7
                          if (flag1) {
                              this.debugBlockIntersection((ServerLevel)this.level(), pos.immutable(), false, false);
 diff --git a/net/minecraft/world/level/BlockGetter.java b/net/minecraft/world/level/BlockGetter.java
-index 3c2f5d40bccaf6582a41079d1c47eb228c72a6ff..01cb853c06a669511f26081f9447756f1f8ad549 100644
+index 3c2f5d40bccaf6582a41079d1c47eb228c72a6ff..32663495d8ac10e76f0995850adf908b4a8258d3 100644
 --- a/net/minecraft/world/level/BlockGetter.java
 +++ b/net/minecraft/world/level/BlockGetter.java
 @@ -231,7 +231,7 @@ public interface BlockGetter extends LevelHeightAccessor {
@@ -89,7 +89,7 @@ index 3c2f5d40bccaf6582a41079d1c47eb228c72a6ff..01cb853c06a669511f26081f9447756f
          if (vec3.lengthSqr() < Mth.square(movedThreshold) || mechanicsTarget.before(me.samsuik.sakura.mechanics.MechanicVersion.v1_21_2)) {
              // Sakura end - configure server mechanics
 -            for (BlockPos blockPos : BlockPos.betweenClosed(boundingBox)) {
-+            for (final BlockPos blockPos : me.samsuik.sakura.utils.BlockPosIterator.iterable(boundingBox)) { // Sakura - optimise check inside blocks
++            for (final BlockPos blockPos : me.samsuik.sakura.utils.SimpleBlockPosIterator.iterable(boundingBox)) { // Sakura - optimise check inside blocks
                  if (!visitor.visit(blockPos, 0)) {
                      return false;
                  }
@@ -102,7 +102,7 @@ index 3c2f5d40bccaf6582a41079d1c47eb228c72a6ff..01cb853c06a669511f26081f9447756f
 +            final boolean yZero = vec3.y() == 0.0;
 +            final boolean zZero = vec3.z() == 0.0;
 +            if (xZero && yZero || yZero && zZero || xZero && zZero) {
-+                for (final BlockPos blockPos : me.samsuik.sakura.utils.BlockPosIterator.traverseArea(vec3, boundingBox)) {
++                for (final BlockPos blockPos : me.samsuik.sakura.utils.SimpleBlockPosIterator.traverseBoundsInDirection(vec3, boundingBox, 16.0)) {
 +                    if (!visitor.visit(blockPos, 0)) {
 +                        return false;
 +                    }
@@ -115,7 +115,7 @@ index 3c2f5d40bccaf6582a41079d1c47eb228c72a6ff..01cb853c06a669511f26081f9447756f
              // Sakura start - configure server mechanics
              if (mechanicsTarget.atLeast(me.samsuik.sakura.mechanics.MechanicVersion.v1_21_9)) {
 -                for (BlockPos blockPos1 : BlockPos.betweenCornersInDirection(boundingBox.move(vec3.scale(-1.0)), vec3)) {
-+                for (BlockPos blockPos1 : me.samsuik.sakura.utils.BlockPosIterator.iterable(boundingBox.move(vec3.scale(-1.0)))) { // Sakura - optimise check inside blocks
++                for (BlockPos blockPos1 : me.samsuik.sakura.utils.SimpleBlockPosIterator.iterable(boundingBox.move(vec3.scale(-1.0)))) { // Sakura - optimise check inside blocks
                      if (!visitor.visit(blockPos1, 0)) {
                          return false;
                      }
@@ -124,7 +124,7 @@ index 3c2f5d40bccaf6582a41079d1c47eb228c72a6ff..01cb853c06a669511f26081f9447756f
                  return false;
              } else {
 -                for (BlockPos blockPos2 : BlockPos.betweenCornersInDirection(boundingBox, vec3)) {
-+                for (final BlockPos blockPos2 : me.samsuik.sakura.utils.BlockPosIterator.iterable(boundingBox)) { // Sakura - optimise check inside blocks
++                for (final BlockPos blockPos2 : me.samsuik.sakura.utils.SimpleBlockPosIterator.iterable(boundingBox)) { // Sakura - optimise check inside blocks
                      if (set.add(blockPos2.asLong()) && !visitor.visit(blockPos2, i + 1)) {
                          return false;
                      }
diff --git a/sakura-server/src/main/java/me/samsuik/sakura/utils/BlockPosIterator.java b/sakura-server/src/main/java/me/samsuik/sakura/utils/SimpleBlockPosIterator.java
similarity index 58%
rename from sakura-server/src/main/java/me/samsuik/sakura/utils/BlockPosIterator.java
rename to sakura-server/src/main/java/me/samsuik/sakura/utils/SimpleBlockPosIterator.java
index 6dc7f5a..4f11ea7 100644
--- a/sakura-server/src/main/java/me/samsuik/sakura/utils/BlockPosIterator.java
+++ b/sakura-server/src/main/java/me/samsuik/sakura/utils/SimpleBlockPosIterator.java
@@ -10,7 +10,7 @@ import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 @NullMarked
-public final class BlockPosIterator extends AbstractIterator<BlockPos> {
+public final class SimpleBlockPosIterator extends AbstractIterator<BlockPos> {
     private final int startX;
     private final int startY;
     private final int startZ;
@@ -19,25 +19,24 @@ public final class BlockPosIterator extends AbstractIterator<BlockPos> {
     private final int endZ;
     private @Nullable MutableBlockPos pos = null;
 
-    public static Iterable<BlockPos> iterable(final AABB bb) {
-        return () -> new BlockPosIterator(bb);
+    public static Iterable<BlockPos> iterable(final AABB bounds) {
+        return () -> new SimpleBlockPosIterator(bounds);
     }
 
-    public static Iterable<BlockPos> traverseArea(final Vec3 vec, final AABB boundingBox) {
-        final double toTravel = Math.min(16.0 / vec.length(), 1.0);
-        final Vec3 movement = vec.scale(toTravel);
-        final AABB fromBB = boundingBox.move(-vec.x, -vec.y, -vec.z);
-        final AABB searchArea = fromBB.expandTowards(movement);
-        return BlockPosIterator.iterable(searchArea);
+    public static Iterable<BlockPos> traverseBoundsInDirection(final Vec3 direction, final AABB bounds, final double maxDistance) {
+        final double scaledDistance = Math.min(maxDistance / direction.length(), 1.0);
+        final AABB previousBounds = bounds.move(direction.scale(-1.0));
+        final AABB boundsToSearch = previousBounds.expandTowards(direction.scale(scaledDistance));
+        return SimpleBlockPosIterator.iterable(boundsToSearch);
     }
 
-    public BlockPosIterator(final AABB bb) {
-        this.startX = Mth.floor(bb.minX);
-        this.startY = Mth.floor(bb.minY);
-        this.startZ = Mth.floor(bb.minZ);
-        this.endX = Mth.floor(bb.maxX);
-        this.endY = Mth.floor(bb.maxY);
-        this.endZ = Mth.floor(bb.maxZ);
+    public SimpleBlockPosIterator(final AABB bounds) {
+        this.startX = Mth.floor(bounds.minX);
+        this.startY = Mth.floor(bounds.minY);
+        this.startZ = Mth.floor(bounds.minZ);
+        this.endX = Mth.floor(bounds.maxX);
+        this.endY = Mth.floor(bounds.maxY);
+        this.endZ = Mth.floor(bounds.maxZ);
     }
 
     @Override