diff --git a/CraftBukkit-Patches/0155-Use-Standard-List-for-EntitySlices.patch b/CraftBukkit-Patches/0155-Use-Standard-List-for-EntitySlices.patch
index 0437b72e61..fe590957b1 100644
--- a/CraftBukkit-Patches/0155-Use-Standard-List-for-EntitySlices.patch
+++ b/CraftBukkit-Patches/0155-Use-Standard-List-for-EntitySlices.patch
@@ -85,6 +85,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          }
          // CraftBukkit end
          world.timings.syncChunkLoadEntitiesTimer.startTiming(); // Spigot
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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 {
+         if (chunk != null) {
+             // moved from Chunk.<init>
+             for (int k = 0; k < chunk.entitySlices.length; ++k) {
+-                chunk.entitySlices[k] = new EntitySlice(net.minecraft.server.Entity.class);
++                chunk.entitySlices[k] = new org.bukkit.craftbukkit.util.UnsafeList();
+             }
+             world.chunkProviderServer.chunks.put(LongHash.toLong(cx, cz), chunk);
+ 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java