diff --git a/Spigot-Server-Patches/0154-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0154-Do-not-load-chunks-for-pathfinding.patch
new file mode 100644
index 0000000000..fe07e6814c
--- /dev/null
+++ b/Spigot-Server-Patches/0154-Do-not-load-chunks-for-pathfinding.patch
@@ -0,0 +1,22 @@
+From 3f12cc95476a3f188589334349356723dace97ed Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Tue, 19 Jan 2016 00:13:19 -0500
+Subject: [PATCH] Do not load chunks for pathfinding
+
+
+diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java
+index 5ae66be..773b562 100644
+--- a/src/main/java/net/minecraft/server/ChunkCache.java
++++ b/src/main/java/net/minecraft/server/ChunkCache.java
+@@ -23,7 +23,7 @@ public class ChunkCache implements IBlockAccess {
+ 
+         for (l = this.a; l <= j; ++l) {
+             for (i1 = this.b; i1 <= k; ++i1) {
+-                this.c[l - this.a][i1 - this.b] = world.getChunkAt(l, i1);
++                this.c[l - this.a][i1 - this.b] = world.getChunkIfLoaded(l, i1); // Paper
+             }
+         }
+ 
+-- 
+2.8.2
+
diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh
index d12a8cccb6..091fff948e 100755
--- a/scripts/importmcdev.sh
+++ b/scripts/importmcdev.sh
@@ -43,6 +43,7 @@ import BlockFurnace
 import BlockIceFrost
 import BlockPosition
 import BlockStateList
+import ChunkCache
 import ChunkProviderFlat
 import ChunkProviderGenerate
 import ChunkProviderHell