diff --git a/Spigot-Server-Patches/Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/Prevent-Enderman-from-loading-chunks.patch
new file mode 100644
index 000000000..ec62a7e1d
--- /dev/null
+++ b/Spigot-Server-Patches/Prevent-Enderman-from-loading-chunks.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <theboyetronic@gmail.com>
+Date: Tue, 18 Dec 2018 02:15:08 +0000
+Subject: [PATCH] Prevent Enderman from loading chunks
+
+
+diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
+index 7ef46851e..1df974bc9 100644
+--- a/src/main/java/net/minecraft/server/EntityEnderman.java
++++ b/src/main/java/net/minecraft/server/EntityEnderman.java
+@@ -0,0 +0,0 @@ public class EntityEnderman extends EntityMonster {
+             int j = MathHelper.floor(this.enderman.locY + random.nextDouble() * 3.0D);
+             int k = MathHelper.floor(this.enderman.locZ - 2.0D + random.nextDouble() * 4.0D);
+             BlockPosition blockposition = new BlockPosition(i, j, k);
+-            IBlockData iblockdata = world.getType(blockposition);
++            IBlockData iblockdata = world.getTypeIfLoaded(blockposition); // Paper
++            if (iblockdata == null) return; // Paper
+             Block block = iblockdata.getBlock();
+             MovingObjectPosition movingobjectposition = world.rayTrace(new Vec3D((double) ((float) MathHelper.floor(this.enderman.locX) + 0.5F), (double) ((float) j + 0.5F), (double) ((float) MathHelper.floor(this.enderman.locZ) + 0.5F)), new Vec3D((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F)), FluidCollisionOption.NEVER, true, false);
+             boolean flag = movingobjectposition != null && movingobjectposition.getBlockPosition().equals(blockposition);
+@@ -0,0 +0,0 @@ public class EntityEnderman extends EntityMonster {
+             int j = MathHelper.floor(this.a.locY + random.nextDouble() * 2.0D);
+             int k = MathHelper.floor(this.a.locZ - 1.0D + random.nextDouble() * 2.0D);
+             BlockPosition blockposition = new BlockPosition(i, j, k);
+-            IBlockData iblockdata = world.getType(blockposition);
++            IBlockData iblockdata = world.getTypeIfLoaded(blockposition); // Paper
++            if (iblockdata == null) return; // Paper
+             IBlockData iblockdata1 = world.getType(blockposition.down());
+             IBlockData iblockdata2 = Block.getValidBlockForPosition(getEnderman().getCarried(), getEnderman().world, blockposition); // Paper - Fix MC-124320
+ 
+--
\ No newline at end of file