diff --git a/paper-server/patches/sources/net/minecraft/world/level/block/FarmBlock.java.patch b/paper-server/patches/sources/net/minecraft/world/level/block/FarmBlock.java.patch
index 5f2869ec20..d862f84ba3 100644
--- a/paper-server/patches/sources/net/minecraft/world/level/block/FarmBlock.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/level/block/FarmBlock.java.patch
@@ -71,3 +71,42 @@
          BlockState iblockdata1 = pushEntitiesUp(state, Blocks.DIRT.defaultBlockState(), world, pos);
  
          world.setBlockAndUpdate(pos, iblockdata1);
+@@ -125,19 +154,28 @@
+     }
+ 
+     private static boolean isNearWater(LevelReader world, BlockPos pos) {
+-        Iterator iterator = BlockPos.betweenClosed(pos.offset(-4, 0, -4), pos.offset(4, 1, 4)).iterator();
++        // Paper start - Perf: remove abstract block iteration
++        int xOff = pos.getX();
++        int yOff = pos.getY();
++        int zOff = pos.getZ();
+ 
+-        BlockPos blockposition1;
+-
+-        do {
+-            if (!iterator.hasNext()) {
+-                return false;
++        for (int dz = -4; dz <= 4; ++dz) {
++            int z = dz + zOff;
++            for (int dx = -4; dx <= 4; ++dx) {
++                int x = xOff + dx;
++                for (int dy = 0; dy <= 1; ++dy) {
++                    int y = dy + yOff;
++                    net.minecraft.world.level.chunk.LevelChunk chunk = (net.minecraft.world.level.chunk.LevelChunk)world.getChunk(x >> 4, z >> 4);
++                    net.minecraft.world.level.material.FluidState fluid = chunk.getBlockStateFinal(x, y, z).getFluidState();
++                    if (fluid.is(FluidTags.WATER)) {
++                        return true;
++                    }
++                }
+             }
++        }
+ 
+-            blockposition1 = (BlockPos) iterator.next();
+-        } while (!world.getFluidState(blockposition1).is(FluidTags.WATER));
+-
+-        return true;
++        return false;
++        // Paper end - Perf: remove abstract block iteration
+     }
+ 
+     @Override