diff --git a/Spigot-Server-Patches/stop-CraftWorld-isChunkLoaded-from-loading-chunks.patch b/Spigot-Server-Patches/stop-CraftWorld-isChunkLoaded-from-loading-chunks.patch
new file mode 100644
index 000000000..34141aeef
--- /dev/null
+++ b/Spigot-Server-Patches/stop-CraftWorld-isChunkLoaded-from-loading-chunks.patch
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <theboyetronic@gmail.com>
+Date: Tue, 21 May 2019 02:34:04 +0100
+Subject: [PATCH] stop CraftWorld#isChunkLoaded from loading chunks
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+index a263d8e7f..4cdc16d5b 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+@@ -0,0 +0,0 @@ public class CraftWorld implements World {
+ 
+     @Override
+     public boolean isChunkLoaded(int x, int z) {
+-        net.minecraft.server.Chunk chunk = world.getChunkProvider().getChunkAt(x, z, false);
+-        return chunk != null && chunk.loaded;
++        return world.getChunkProvider().playerChunkMap.updatingChunks.containsKey(ChunkCoordIntPair.pair(x, z)); // Paper
+     }
+ 
+     @Override
+--
\ No newline at end of file