diff --git a/Spigot-Server-Patches/ChunkMap-caching.patch b/Spigot-Server-Patches/ChunkMap-caching.patch
index 3b862a986..19ea6a43f 100644
--- a/Spigot-Server-Patches/ChunkMap-caching.patch
+++ b/Spigot-Server-Patches/ChunkMap-caching.patch
@@ -13,39 +13,77 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      // PaperSpigot end
  
 +    // PaperSpigot start - ChunkMap caching
-+    private final Object chunkMapLock = new Object();
 +    private PacketPlayOutMapChunk.ChunkMap chunkMap;
-+    private boolean chunkMapDirty = true;
-+
-+    public void setDirty() {
-+        synchronized (chunkMapLock) {
-+            chunkMapDirty = true;
-+        }
-+    }
++    private int emptySectionBits;
 +
 +    public PacketPlayOutMapChunk.ChunkMap getChunkMap() {
-+        synchronized (chunkMapLock) {
-+            if (chunkMapDirty || chunkMap == null) {
-+                chunkMapDirty = false;
-+                chunkMap = PacketPlayOutMapChunk.a(this, true, !world.worldProvider.o(), '\uffff');
++        boolean isDirty = false;
++        for (int i = 0; i < sections.length; ++i) {
++            ChunkSection section = sections[i];
++            if (section == null) {
++                if ((emptySectionBits & (1 << i)) == 0) {
++                    isDirty = true;
++                    emptySectionBits |= (1 << i);
++                }
++            } else {
++                if ((emptySectionBits & (1 << i)) == 1) {
++                    isDirty = true;
++                    emptySectionBits &= ~(1 << i);
++                    section.isDirty = false;
++                } else if (section.isDirty) {
++                    isDirty = true;
++                    section.isDirty = false;
++                }
 +            }
-+
-+            return chunkMap;
 +        }
++
++        if (isDirty || chunkMap == null) {
++            chunkMap = PacketPlayOutMapChunk.a(this, true, !world.worldProvider.o(), '\uffff');
++        }
++
++        return chunkMap;
 +    }
 +    // PaperSpigot end
 +
      // CraftBukkit start - Neighbor loaded cache for chunk lighting and entity ticking
      private int neighbors = 0x1 << 12;
  
-@@ -0,0 +0,0 @@ public class Chunk {
+diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/ChunkSection.java
++++ b/src/main/java/net/minecraft/server/ChunkSection.java
+@@ -0,0 +0,0 @@ public class ChunkSection {
+     private char[] blockIds;
+     private NibbleArray emittedLight;
+     private NibbleArray skyLight;
++    boolean isDirty; // PaperSpigot
+ 
+     public ChunkSection(int i, boolean flag) {
+         this.yPos = i;
+@@ -0,0 +0,0 @@ public class ChunkSection {
+         }
+ 
+         this.blockIds[j << 8 | k << 4 | i] = (char) Block.d.b(iblockdata);
++        isDirty = true; // PaperSpigot
      }
  
-     public IBlockData a(BlockPosition blockposition, IBlockData iblockdata) {
-+        setDirty(); // PaperSpigot
-         int i = blockposition.getX() & 15;
-         int j = blockposition.getY();
-         int k = blockposition.getZ() & 15;
+     public Block b(int i, int j, int k) {
+@@ -0,0 +0,0 @@ public class ChunkSection {
+ 
+     public void a(int i, int j, int k, int l) {
+         this.skyLight.a(i, j, k, l);
++        isDirty = true; // PaperSpigot
+     }
+ 
+     public int d(int i, int j, int k) {
+@@ -0,0 +0,0 @@ public class ChunkSection {
+ 
+     public void b(int i, int j, int k, int l) {
+         this.emittedLight.a(i, j, k, l);
++        isDirty = true; // PaperSpigot
+     }
+ 
+     public int e(int i, int j, int k) {
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
@@ -59,18 +97,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          chunk.world.spigotConfig.antiXrayInstance.obfuscateSync(chunk.locX, chunk.locZ, c.b, c.a, chunk.world);
      }
  
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
+diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunkBulk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunkBulk.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/World.java
-+++ b/src/main/java/net/minecraft/server/World.java
-@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
-                 }
-             }
+--- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunkBulk.java
++++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunkBulk.java
+@@ -0,0 +0,0 @@ public class PacketPlayOutMapChunkBulk implements Packet<PacketListenerPlayOut>
  
-+            chunk.setDirty(); // PaperSpigot
-             // PaperSpigot start - Asynchronous light updates
-             if (chunk.world.paperSpigotConfig.useAsyncLighting) {
-                 chunk.pendingLightUpdates.decrementAndGet();
+         for (int j = 0; j < i; ++j) {
+             Chunk chunk = (Chunk) list.get(j);
+-            PacketPlayOutMapChunk.ChunkMap packetplayoutmapchunk_chunkmap = PacketPlayOutMapChunk.a(chunk, true, this.d, '\uffff');
++            PacketPlayOutMapChunk.ChunkMap packetplayoutmapchunk_chunkmap = chunk.getChunkMap(); // PaperSpigot
+ 
+             this.a[j] = chunk.locX;
+             this.b[j] = chunk.locZ;
 -- 
 1.9.5.msysgit.1