diff --git a/src/main/java/net/minecraft/server/ItemWorldMap.java b/src/main/java/net/minecraft/server/ItemWorldMap.java
index 652b62ac52..848e6670eb 100644
--- a/src/main/java/net/minecraft/server/ItemWorldMap.java
+++ b/src/main/java/net/minecraft/server/ItemWorldMap.java
@@ -112,6 +112,7 @@ public class ItemWorldMap extends ItemWorldMapBase {
 
                                                 if (!flag1) {
                                                     --k4;
+                                                    if (k4 <= 0) break; // CraftBukkit
                                                     j5 = chunk.getTypeId(l4 + k3, k4 - 1, j4 + l3);
                                                 }
                                             } while (k4 > 0 && !flag1);