diff --git a/removed/1.15/0399-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0395-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 58%
rename from removed/1.15/0399-Use-getChunkIfLoadedImmediately-in-places.patch
rename to Spigot-Server-Patches/0395-Use-getChunkIfLoadedImmediately-in-places.patch
index e8acb41c9..0184c40d3 100644
--- a/removed/1.15/0399-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/Spigot-Server-Patches/0395-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -1,4 +1,4 @@
-From 59cfc5788449e1f54560c9c2ff59b4ff2efd6b5d Mon Sep 17 00:00:00 2001
+From 914a609ce5874bb04211ccd2cca2f7f6452acb66 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 8 Jul 2019 00:13:36 -0700
 Subject: [PATCH] Use getChunkIfLoadedImmediately in places
@@ -8,10 +8,10 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk
 load in that case).
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 55c73ffca..e8def7f81 100644
+index f0d1a5b14d..8c88cf6370 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -199,7 +199,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -204,7 +204,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean isChunkLoaded() {
@@ -21,48 +21,59 @@ index 55c73ffca..e8def7f81 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4a16d6c14..ae17cdf23 100644
+index 8c54022e07..f6fbba36f4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -981,7 +981,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -989,7 +989,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                                  speed = player.abilities.walkSpeed * 10f;
                              }
                              // Paper start - Prevent moving into unloaded chunks
--                            if (player.world.paperConfig.preventMovingIntoUnloadedChunks && (this.player.locX != toX || this.player.locZ != toZ) && !worldserver.isChunkLoaded((int) Math.floor(toX) >> 4, (int) Math.floor(toZ) >> 4)) {
-+                            if (player.world.paperConfig.preventMovingIntoUnloadedChunks && (this.player.locX != toX || this.player.locZ != toZ) && worldserver.getChunkIfLoadedImmediately((int) Math.floor(toX) >> 4, (int) Math.floor(toZ) >> 4) == null) { // Paper - use getIfLoadedImmediately
-                                 this.internalTeleport(this.player.locX, this.player.locY, this.player.locZ, this.player.yaw, this.player.pitch, Collections.emptySet());
+-                            if (player.world.paperConfig.preventMovingIntoUnloadedChunks && (this.player.locX() != toX || this.player.locZ() != toZ) && !worldserver.isChunkLoaded((int) Math.floor(toX) >> 4, (int) Math.floor(toZ) >> 4)) {
++                            if (player.world.paperConfig.preventMovingIntoUnloadedChunks && (this.player.locX() != toX || this.player.locZ() != toZ) && worldserver.getChunkIfLoadedImmediately((int) Math.floor(toX) >> 4, (int) Math.floor(toZ) >> 4) == null) { // Paper - use getIfLoadedImmediately
+                                 this.internalTeleport(this.player.locX(), this.player.locY(), this.player.locZ(), this.player.yaw, this.player.pitch, Collections.emptySet());
                                  return;
                              }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ab98c7b79..b81b37445 100644
+index 1262e0097f..f701e079db 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -131,7 +131,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
+@@ -130,8 +130,16 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      }
  
      public Chunk getChunkIfLoaded(int x, int z) {
 -        return ((ChunkProviderServer) this.chunkProvider).getChunkAt(x, z, false);
 +        return ((ChunkProviderServer) this.chunkProvider).getChunkAtIfLoadedImmediately(x, z); // Paper
      }
++    // Paper start
++    @Override
++    public boolean isChunkLoaded(int x, int z) {
++        return getChunkIfLoaded(x, z) != null;
++    }
++
++
++    // Paper end
  
      protected World(WorldData worlddata, DimensionManager dimensionmanager, BiFunction<World, WorldProvider, IChunkProvider> bifunction, GameProfilerFiller gameprofilerfiller, boolean flag, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env) {
-@@ -274,12 +274,12 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
+         this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
+@@ -1123,14 +1131,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      }
  
-     public boolean isLoaded(BlockPosition blockposition) {
--        return getChunkIfLoaded(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null; // Paper
-+        return getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null; // Paper
+     public boolean n(BlockPosition blockposition) {
+-        return isOutsideWorld(blockposition) ? false : this.chunkProvider.b(blockposition.getX() >> 4, blockposition.getZ() >> 4);
++        return isOutsideWorld(blockposition) ? false : isChunkLoaded(blockposition.getX() >> 4, blockposition.getZ() >> 4); // Paper
      }
  
-     // Paper start
-     public boolean isLoadedAndInBounds(BlockPosition blockposition) {
--        return getWorldBorder().isInBounds(blockposition) && getChunkIfLoaded(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null;
-+        return getWorldBorder().isInBounds(blockposition) && getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null;
-     }
-     public Chunk getChunkIfLoaded(BlockPosition blockposition) {
-         return getChunkIfLoaded(blockposition.getX() >> 4, blockposition.getZ() >> 4);
+     public boolean a(BlockPosition blockposition, Entity entity) {
+         if (isOutsideWorld(blockposition)) {
+             return false;
+         } else {
+-            IChunkAccess ichunkaccess = this.getChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4, ChunkStatus.FULL, false);
++            IChunkAccess ichunkaccess = this.getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4); // Paper
+ 
+             return ichunkaccess == null ? false : ichunkaccess.getType(blockposition).a((IBlockAccess) this, blockposition, entity);
+         }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index f86404f83..92601c581 100644
+index f86404f83a..92601c581c 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -143,9 +143,10 @@ public class ActivationRange
@@ -79,5 +90,5 @@ index f86404f83..92601c581 100644
                  }
              }
 -- 
-2.23.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0415-Reduce-sync-loads.patch b/Spigot-Server-Patches/0396-Reduce-sync-loads.patch
similarity index 88%
rename from Spigot-Server-Patches/0415-Reduce-sync-loads.patch
rename to Spigot-Server-Patches/0396-Reduce-sync-loads.patch
index 86a55cd1e..908bd0457 100644
--- a/Spigot-Server-Patches/0415-Reduce-sync-loads.patch
+++ b/Spigot-Server-Patches/0396-Reduce-sync-loads.patch
@@ -1,4 +1,4 @@
-From f90a04ddc82483f855e77ec91c3de3f9e2befdf6 Mon Sep 17 00:00:00 2001
+From e4b7f58ef87523749b79982993f6d6ce1ff867e4 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 19 Jul 2019 03:29:14 -0700
 Subject: [PATCH] Reduce sync loads
@@ -11,7 +11,7 @@ it must be enabled by setting the startup flag -Dpaper.debug-sync-loads=true
 To get a debug log for sync loads, the command is /paper syncloadinfo
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 09efbf725..132397b3f 100644
+index 09efbf7250..132397b3f3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -1,9 +1,13 @@
@@ -91,7 +91,7 @@ index 09efbf725..132397b3f 100644
          if (args.length < 2 || args[1].equals("*")) {
 diff --git a/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java
 new file mode 100644
-index 000000000..59aec1032
+index 0000000000..59aec10329
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java
 @@ -0,0 +1,172 @@
@@ -268,7 +268,7 @@ index 000000000..59aec1032
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 277c2245d..8d7971ad8 100644
+index 1f6b1c4f16..58654f4538 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -280,6 +280,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -280,27 +280,10 @@ index 277c2245d..8d7971ad8 100644
              this.serverThreadQueue.awaitTasks(completablefuture::isDone);
                  com.destroystokyo.paper.io.chunk.ChunkTaskManager.popChunkWait(); // Paper - async chunk debug
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b81b37445..9d29fc8ca 100644
+index f701e079db..0baa884bbf 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1195,14 +1195,14 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
-     }
- 
-     public boolean n(BlockPosition blockposition) {
--        return isOutsideWorld(blockposition) ? false : this.chunkProvider.b(blockposition.getX() >> 4, blockposition.getZ() >> 4);
-+        return isOutsideWorld(blockposition) ? false : this.isLoaded(blockposition); // Paper - reduce sync loads
-     }
- 
-     public boolean a(BlockPosition blockposition, Entity entity) {
-         if (isOutsideWorld(blockposition)) {
-             return false;
-         } else {
--            IChunkAccess ichunkaccess = this.getChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4, ChunkStatus.FULL, false);
-+            IChunkAccess ichunkaccess = this.getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4); // Paper - reduce sync loads
- 
-             return ichunkaccess == null ? false : ichunkaccess.getType(blockposition).a((IBlockAccess) this, blockposition, entity);
-         }
-@@ -1249,7 +1249,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
+@@ -1186,7 +1186,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
  
          for (int i1 = i; i1 <= j; ++i1) {
              for (int j1 = k; j1 <= l; ++j1) {
@@ -309,7 +292,7 @@ index b81b37445..9d29fc8ca 100644
  
                  if (chunk != null) {
                      chunk.a(entity, axisalignedbb, list, predicate);
-@@ -1269,7 +1269,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
+@@ -1206,7 +1206,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
  
          for (int i1 = i; i1 < j; ++i1) {
              for (int j1 = k; j1 < l; ++j1) {
@@ -318,7 +301,7 @@ index b81b37445..9d29fc8ca 100644
  
                  if (chunk != null) {
                      chunk.a(entitytypes, axisalignedbb, list, predicate);
-@@ -1291,7 +1291,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
+@@ -1228,7 +1228,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
  
          for (int i1 = i; i1 < j; ++i1) {
              for (int j1 = k; j1 < l; ++j1) {
@@ -328,10 +311,10 @@ index b81b37445..9d29fc8ca 100644
                  if (chunk != null) {
                      chunk.a(oclass, axisalignedbb, list, predicate);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 3a6745dcc..b7878201b 100644
+index 59b2fc6297..9aaa28e6cd 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -151,6 +151,12 @@ public class WorldServer extends World {
+@@ -153,6 +153,12 @@ public class WorldServer extends World {
      };
      public final com.destroystokyo.paper.io.chunk.ChunkTaskManager asyncChunkTaskManager;
      // Paper end
@@ -345,5 +328,5 @@ index 3a6745dcc..b7878201b 100644
      // Add env and gen to constructor
      public WorldServer(MinecraftServer minecraftserver, Executor executor, WorldNBTStorage worldnbtstorage, WorldData worlddata, DimensionManager dimensionmanager, GameProfilerFiller gameprofilerfiller, WorldLoadListener worldloadlistener, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) {
 -- 
-2.23.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0395-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0397-Implement-alternative-item-despawn-rate.patch
similarity index 97%
rename from Spigot-Server-Patches/0395-Implement-alternative-item-despawn-rate.patch
rename to Spigot-Server-Patches/0397-Implement-alternative-item-despawn-rate.patch
index e89cb6d1b..a61da627c 100644
--- a/Spigot-Server-Patches/0395-Implement-alternative-item-despawn-rate.patch
+++ b/Spigot-Server-Patches/0397-Implement-alternative-item-despawn-rate.patch
@@ -1,11 +1,11 @@
-From 9e35123c351ae0b3696ab265d2f9b30a93429ae0 Mon Sep 17 00:00:00 2001
+From a3ce0687113e7435466aa6425bb1b1d016444c96 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Mon, 3 Jun 2019 02:02:39 -0400
 Subject: [PATCH] Implement alternative item-despawn-rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0fc77ac28..3dfe54ad3 100644
+index 0fc77ac287..3dfe54ad3d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -1,12 +1,17 @@
@@ -80,7 +80,7 @@ index 0fc77ac28..3dfe54ad3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index a0d1e7fd2..e61af3f5e 100644
+index a0d1e7fd27..e61af3f5eb 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -6,6 +6,7 @@ import java.util.Objects;
diff --git a/Spigot-Server-Patches/0396-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0398-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
similarity index 92%
rename from Spigot-Server-Patches/0396-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
rename to Spigot-Server-Patches/0398-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
index bed5af9bb..f5f97a23e 100644
--- a/Spigot-Server-Patches/0396-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
+++ b/Spigot-Server-Patches/0398-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
@@ -1,4 +1,4 @@
-From 4257f851558da8e1962d5b519705e72809aa768e Mon Sep 17 00:00:00 2001
+From 738eb7de57934483c0a8ecb4f3cd8195de2ddc91 Mon Sep 17 00:00:00 2001
 From: Paul Sauve <paul@burngames.net>
 Date: Sun, 14 Jul 2019 21:05:03 -0500
 Subject: [PATCH] Do less work if we have a custom Bukkit generator
@@ -7,10 +7,10 @@ If the Bukkit generator already has a spawn, use it immediately instead
 of spending time generating one that we won't use
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 59b2fc629..3283fb49e 100644
+index 9aaa28e6cd..219861a2d8 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -782,12 +782,13 @@ public class WorldServer extends World {
+@@ -788,12 +788,13 @@ public class WorldServer extends World {
          } else if (this.worldData.getType() == WorldType.DEBUG_ALL_BLOCK_STATES) {
              this.worldData.setSpawn(BlockPosition.ZERO.up());
          } else {
@@ -30,7 +30,7 @@ index 59b2fc629..3283fb49e 100644
              // CraftBukkit start
              if (this.generator != null) {
                  Random rand = new Random(this.getSeed());
-@@ -804,6 +805,13 @@ public class WorldServer extends World {
+@@ -810,6 +811,13 @@ public class WorldServer extends World {
              }
              // CraftBukkit end
  
diff --git a/Spigot-Server-Patches/0397-Fix-MC-158900.patch b/Spigot-Server-Patches/0399-Fix-MC-158900.patch
similarity index 93%
rename from Spigot-Server-Patches/0397-Fix-MC-158900.patch
rename to Spigot-Server-Patches/0399-Fix-MC-158900.patch
index ee1d4569e..45d178670 100644
--- a/Spigot-Server-Patches/0397-Fix-MC-158900.patch
+++ b/Spigot-Server-Patches/0399-Fix-MC-158900.patch
@@ -1,4 +1,4 @@
-From 6811bf46f6a3ca0ba3ba8f60a7fa3493ffd52e13 Mon Sep 17 00:00:00 2001
+From d6f295929cac80322a5f226500da150518ca05ca Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 13 Aug 2019 06:35:17 -0700
 Subject: [PATCH] Fix MC-158900
@@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it
 was expired at that point, then it would be null.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 68e089a4b..f702619aa 100644
+index 68e089a4b6..f702619aa2 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -513,8 +513,10 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0398-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0400-implement-optional-per-player-mob-spawns.patch
similarity index 98%
rename from Spigot-Server-Patches/0398-implement-optional-per-player-mob-spawns.patch
rename to Spigot-Server-Patches/0400-implement-optional-per-player-mob-spawns.patch
index 5a5c56931..c137467f7 100644
--- a/Spigot-Server-Patches/0398-implement-optional-per-player-mob-spawns.patch
+++ b/Spigot-Server-Patches/0400-implement-optional-per-player-mob-spawns.patch
@@ -1,11 +1,11 @@
-From febabd29e552155122e89f014628722121f6a21d Mon Sep 17 00:00:00 2001
+From ea1ab70c96e2f98199bd9ba00c64fabd922f4d2d Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Mon, 19 Aug 2019 01:27:58 +0500
 Subject: [PATCH] implement optional per player mob spawns
 
 
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
-index 8de6c4816..e25544f11 100644
+index 8de6c4816c..e25544f116 100644
 --- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -62,6 +62,7 @@ public class WorldTimingsHandler {
@@ -25,7 +25,7 @@ index 8de6c4816..e25544f11 100644
          poiUnload = Timings.ofSafe(name + "Chunk unload - POI");
          chunkUnload = Timings.ofSafe(name + "Chunk unload - Chunk");
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3dfe54ad3..02715539a 100644
+index 3dfe54ad3d..02715539ae 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -611,4 +611,9 @@ public class PaperWorldConfig {
@@ -40,7 +40,7 @@ index 3dfe54ad3..02715539a 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java
 new file mode 100644
-index 000000000..9ebd7ecb7
+index 0000000000..9ebd7ecb7a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java
 @@ -0,0 +1,253 @@
@@ -299,7 +299,7 @@ index 000000000..9ebd7ecb7
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java b/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java
 new file mode 100644
-index 000000000..4f13d3ff8
+index 0000000000..4f13d3ff83
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java
 @@ -0,0 +1,241 @@
@@ -545,10 +545,10 @@ index 000000000..4f13d3ff8
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 1f6b1c4f1..cbe4b23e1 100644
+index 58654f4538..8a35e2994d 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -554,7 +554,22 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -555,7 +555,22 @@ public class ChunkProviderServer extends IChunkProvider {
              this.world.timings.countNaturalMobs.startTiming(); // Paper - timings
              int l = this.chunkMapDistance.b();
              EnumCreatureType[] aenumcreaturetype = EnumCreatureType.values();
@@ -572,7 +572,7 @@ index 1f6b1c4f1..cbe4b23e1 100644
  
              this.world.timings.countNaturalMobs.stopTiming(); // Paper - timings
              this.world.getMethodProfiler().exit();
-@@ -619,8 +634,23 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -620,8 +635,23 @@ public class ChunkProviderServer extends IChunkProvider {
                                  if (enumcreaturetype != EnumCreatureType.MISC && (!enumcreaturetype.c() || this.allowAnimals) && (enumcreaturetype.c() || this.allowMonsters) && (!enumcreaturetype.d() || flag2)) {
                                      int k1 = limit * l / ChunkProviderServer.b; // CraftBukkit - use per-world limits
  
@@ -599,7 +599,7 @@ index 1f6b1c4f1..cbe4b23e1 100644
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 72938a2e2..1b0ef1442 100644
+index ba30730b5a..7fbd390426 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -80,6 +80,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -631,7 +631,7 @@ index 72938a2e2..1b0ef1442 100644
          return this.cs;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index d49ad0308..2fb04e3e9 100644
+index d49ad03089..2fb04e3e93 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -254,6 +254,7 @@ public class EntityTypes<T extends Entity> {
@@ -643,7 +643,7 @@ index d49ad0308..2fb04e3e9 100644
          return this.bb;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index fce37d0d6..b37c1161d 100644
+index fce37d0d67..b37c1161d1 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -78,7 +78,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -682,7 +682,7 @@ index fce37d0d6..b37c1161d 100644
  
      private static double a(ChunkCoordIntPair chunkcoordintpair, Entity entity) {
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index fdac5bb3a..58bbf2f9d 100644
+index fdac5bb3a2..58bbf2f9d2 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -3,6 +3,7 @@ package net.minecraft.server;
@@ -755,10 +755,10 @@ index fdac5bb3a..58bbf2f9d 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 3283fb49e..4da34b6dd 100644
+index 219861a2d8..919472370d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -999,7 +999,20 @@ public class WorldServer extends World {
+@@ -1005,7 +1005,20 @@ public class WorldServer extends World {
      }
  
      public Object2IntMap<EnumCreatureType> l() {
@@ -780,7 +780,7 @@ index 3283fb49e..4da34b6dd 100644
          ObjectIterator objectiterator = this.entitiesById.values().iterator();
  
          while (objectiterator.hasNext()) {
-@@ -1024,11 +1037,16 @@ public class WorldServer extends World {
+@@ -1030,11 +1043,16 @@ public class WorldServer extends World {
                      continue;
                  }
                  // Paper end
diff --git a/Spigot-Server-Patches/0399-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0401-Prevent-consuming-the-wrong-itemstack.patch
similarity index 95%
rename from Spigot-Server-Patches/0399-Prevent-consuming-the-wrong-itemstack.patch
rename to Spigot-Server-Patches/0401-Prevent-consuming-the-wrong-itemstack.patch
index d68a3286c..306f0205c 100644
--- a/Spigot-Server-Patches/0399-Prevent-consuming-the-wrong-itemstack.patch
+++ b/Spigot-Server-Patches/0401-Prevent-consuming-the-wrong-itemstack.patch
@@ -1,11 +1,11 @@
-From 143fdd3ad7154628822eb7b37a79c34e0b147154 Mon Sep 17 00:00:00 2001
+From 7f39bb23d384752d3eadd1651fa4966b7dfe310d Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Mon, 19 Aug 2019 19:42:35 +0500
 Subject: [PATCH] Prevent consuming the wrong itemstack
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 43b8a722d..e3c562a63 100644
+index 43b8a722d0..e3c562a63b 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2891,10 +2891,13 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0400-only-add-passanger-entities-once-from-spawners.patch b/Spigot-Server-Patches/0402-only-add-passanger-entities-once-from-spawners.patch
similarity index 90%
rename from Spigot-Server-Patches/0400-only-add-passanger-entities-once-from-spawners.patch
rename to Spigot-Server-Patches/0402-only-add-passanger-entities-once-from-spawners.patch
index ad7212839..6821497fb 100644
--- a/Spigot-Server-Patches/0400-only-add-passanger-entities-once-from-spawners.patch
+++ b/Spigot-Server-Patches/0402-only-add-passanger-entities-once-from-spawners.patch
@@ -1,11 +1,11 @@
-From 60c5a3eadace43601c261dcab7988eeb91daa80d Mon Sep 17 00:00:00 2001
+From 6b1aa5b32221f9b236fd0aa3e1f7cccd16c8c6bc Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Wed, 21 Aug 2019 23:57:32 +0500
 Subject: [PATCH] only add passanger entities once from spawners
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index b179893a1..b96f6461d 100644
+index b179893a17..b96f6461da 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -195,7 +195,7 @@ public abstract class MobSpawnerAbstract {
diff --git a/Spigot-Server-Patches/0401-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0403-Fix-nether-portal-creation.patch
similarity index 91%
rename from Spigot-Server-Patches/0401-Fix-nether-portal-creation.patch
rename to Spigot-Server-Patches/0403-Fix-nether-portal-creation.patch
index ceb527e12..21095d855 100644
--- a/Spigot-Server-Patches/0401-Fix-nether-portal-creation.patch
+++ b/Spigot-Server-Patches/0403-Fix-nether-portal-creation.patch
@@ -1,11 +1,11 @@
-From f0f46d43193359ce2da180cf62388f4bb0cf8492 Mon Sep 17 00:00:00 2001
+From b9873f7ec14b05ee084faa1e9e94b464b596d3b5 Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Mon, 9 Sep 2019 13:21:17 +1000
 Subject: [PATCH] Fix nether portal creation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
-index 60330f753..c22dbbfbe 100644
+index 60330f753f..c22dbbfbe8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
 @@ -38,6 +38,11 @@ public class BlockStateListPopulator extends DummyGeneratorAccess {
diff --git a/Spigot-Server-Patches/0402-Generator-Settings.patch b/Spigot-Server-Patches/0404-Generator-Settings.patch
similarity index 95%
rename from Spigot-Server-Patches/0402-Generator-Settings.patch
rename to Spigot-Server-Patches/0404-Generator-Settings.patch
index ec1602c88..3526de5c2 100644
--- a/Spigot-Server-Patches/0402-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0404-Generator-Settings.patch
@@ -1,11 +1,11 @@
-From 1132dc0ee9abdb91711b1b53acf147071e64793f Mon Sep 17 00:00:00 2001
+From c923211b3672cb2d07e773698eb8db87dff32c9c Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 02:17:54 -0600
 Subject: [PATCH] Generator Settings
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 02715539a..33e251c87 100644
+index 02715539ae..33e251c87f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -616,4 +616,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 02715539a..33e251c87 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
-index af81a8414..2268fbdd8 100644
+index af81a84142..2268fbdd87 100644
 --- a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
 +++ b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
 @@ -211,8 +211,8 @@ public abstract class ChunkGeneratorAbstract<T extends GeneratorSettingsDefault>
diff --git a/Spigot-Server-Patches/0403-Fix-zero-tick-instant-grow-farms-MC-113809.patch b/Spigot-Server-Patches/0405-Fix-zero-tick-instant-grow-farms-MC-113809.patch
similarity index 93%
rename from Spigot-Server-Patches/0403-Fix-zero-tick-instant-grow-farms-MC-113809.patch
rename to Spigot-Server-Patches/0405-Fix-zero-tick-instant-grow-farms-MC-113809.patch
index 95a9826cd..ff1629d52 100644
--- a/Spigot-Server-Patches/0403-Fix-zero-tick-instant-grow-farms-MC-113809.patch
+++ b/Spigot-Server-Patches/0405-Fix-zero-tick-instant-grow-farms-MC-113809.patch
@@ -1,11 +1,11 @@
-From 34d5d7b08effeb1618c2fa65e3af8164431630c1 Mon Sep 17 00:00:00 2001
+From 106a1b3fc7f29c9839758d192d7ef5f434e5f239 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sun, 15 Sep 2019 11:32:32 -0500
 Subject: [PATCH] Fix zero-tick instant grow farms MC-113809
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 33e251c87..c0af1aaf3 100644
+index 33e251c87f..c0af1aaf3b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -564,6 +564,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 33e251c87..c0af1aaf3 100644
      public Map<Material, Integer> altItemDespawnRateMap;
      private void altItemDespawnRate() {
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 46490a943..54a61283e 100644
+index 46490a9430..54a61283e6 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -46,6 +46,7 @@ public class Block implements IMaterial {
@@ -33,7 +33,7 @@ index 46490a943..54a61283e 100644
      private final boolean i;
      private final boolean j;
 diff --git a/src/main/java/net/minecraft/server/BlockBamboo.java b/src/main/java/net/minecraft/server/BlockBamboo.java
-index c482aad3e..02c548dd9 100644
+index c482aad3e3..02c548dd9c 100644
 --- a/src/main/java/net/minecraft/server/BlockBamboo.java
 +++ b/src/main/java/net/minecraft/server/BlockBamboo.java
 @@ -85,6 +85,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement {
@@ -45,7 +45,7 @@ index c482aad3e..02c548dd9 100644
                  int i = this.b(worldserver, blockposition) + 1;
  
 diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
-index e0974e256..3524fcb92 100644
+index e0974e256f..3524fcb927 100644
 --- a/src/main/java/net/minecraft/server/BlockCactus.java
 +++ b/src/main/java/net/minecraft/server/BlockCactus.java
 @@ -21,6 +21,7 @@ public class BlockCactus extends Block {
@@ -57,7 +57,7 @@ index e0974e256..3524fcb92 100644
  
              if (worldserver.isEmpty(blockposition1)) {
 diff --git a/src/main/java/net/minecraft/server/BlockChorusFlower.java b/src/main/java/net/minecraft/server/BlockChorusFlower.java
-index d70b52cad..b624cf380 100644
+index d70b52cadf..b624cf3804 100644
 --- a/src/main/java/net/minecraft/server/BlockChorusFlower.java
 +++ b/src/main/java/net/minecraft/server/BlockChorusFlower.java
 @@ -22,6 +22,7 @@ public class BlockChorusFlower extends Block {
@@ -69,7 +69,7 @@ index d70b52cad..b624cf380 100644
  
              if (worldserver.isEmpty(blockposition1) && blockposition1.getY() < 256) {
 diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
-index 55b07444e..3bc3c5aa2 100644
+index 55b07444e1..3bc3c5aa29 100644
 --- a/src/main/java/net/minecraft/server/BlockReed.java
 +++ b/src/main/java/net/minecraft/server/BlockReed.java
 @@ -23,6 +23,7 @@ public class BlockReed extends Block {
@@ -81,10 +81,10 @@ index 55b07444e..3bc3c5aa2 100644
  
              for (i = 1; worldserver.getType(blockposition.down(i)).getBlock() == this; ++i) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 4da34b6dd..83fb8737a 100644
+index 919472370d..3739a95c5a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -575,7 +575,9 @@ public class WorldServer extends World {
+@@ -581,7 +581,9 @@ public class WorldServer extends World {
                          IBlockData iblockdata = chunksection.getType(blockposition2.getX() - j, blockposition2.getY() - j1, blockposition2.getZ() - k);
  
                          if (iblockdata.q()) {
diff --git a/Spigot-Server-Patches/0404-Fix-MC-161754.patch b/Spigot-Server-Patches/0406-Fix-MC-161754.patch
similarity index 90%
rename from Spigot-Server-Patches/0404-Fix-MC-161754.patch
rename to Spigot-Server-Patches/0406-Fix-MC-161754.patch
index a4a9a5762..c93a82805 100644
--- a/Spigot-Server-Patches/0404-Fix-MC-161754.patch
+++ b/Spigot-Server-Patches/0406-Fix-MC-161754.patch
@@ -1,4 +1,4 @@
-From 540b6207ac043f0b18905843b06ac9b2f31c6ef7 Mon Sep 17 00:00:00 2001
+From 95eb89d0f29cfb355255285d50a508d501207d79 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 24 Sep 2019 16:03:00 -0700
 Subject: [PATCH] Fix MC-161754
@@ -9,7 +9,7 @@ We can use an entity valid check since this method is invoked for
 each inventory iteraction (thanks to CB) and on player tick (vanilla).
 
 diff --git a/src/main/java/net/minecraft/server/ContainerHorse.java b/src/main/java/net/minecraft/server/ContainerHorse.java
-index c95ce0124..18e1ae7f0 100644
+index c95ce0124d..18e1ae7f0a 100644
 --- a/src/main/java/net/minecraft/server/ContainerHorse.java
 +++ b/src/main/java/net/minecraft/server/ContainerHorse.java
 @@ -76,7 +76,7 @@ public class ContainerHorse extends Container {
diff --git a/Spigot-Server-Patches/0405-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0407-Performance-improvement-for-Chunk.getEntities.patch
similarity index 94%
rename from Spigot-Server-Patches/0405-Performance-improvement-for-Chunk.getEntities.patch
rename to Spigot-Server-Patches/0407-Performance-improvement-for-Chunk.getEntities.patch
index 671067b61..b9e8c096f 100644
--- a/Spigot-Server-Patches/0405-Performance-improvement-for-Chunk.getEntities.patch
+++ b/Spigot-Server-Patches/0407-Performance-improvement-for-Chunk.getEntities.patch
@@ -1,4 +1,4 @@
-From 6c486f323f302b16d1edbbd44981886a0b3f8668 Mon Sep 17 00:00:00 2001
+From f2199c6f3926d2a0a3d304cc86b5afb02077e1e6 Mon Sep 17 00:00:00 2001
 From: wea_ondara <wea_ondara@alpenblock.net>
 Date: Thu, 10 Oct 2019 11:29:42 +0200
 Subject: [PATCH] Performance improvement for Chunk.getEntities
@@ -10,7 +10,7 @@ operation. This patch will reduce the load of plugins which for example
 implement custom moblimits and depend on Chunk.getEntities().
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 91f2066b1..9cff8b88b 100644
+index 91f2066b12..9cff8b88ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -112,14 +112,14 @@ public class CraftChunk implements Chunk {
diff --git a/Spigot-Server-Patches/0406-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0408-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
similarity index 93%
rename from Spigot-Server-Patches/0406-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
rename to Spigot-Server-Patches/0408-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
index 81985697c..6ba736a9c 100644
--- a/Spigot-Server-Patches/0406-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
+++ b/Spigot-Server-Patches/0408-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
@@ -1,4 +1,4 @@
-From 1b6b2b8c524a8742957d2740a6c0415f19ce2dc5 Mon Sep 17 00:00:00 2001
+From a38902b30837e45fc998e9956e2079c482348c5a Mon Sep 17 00:00:00 2001
 From: MisterErwin <git@askarian.net>
 Date: Wed, 30 Oct 2019 16:57:54 +0100
 Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 739968a69..a97439102 100644
+index 739968a69b..a974391025 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1824,7 +1824,12 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0407-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0409-Expose-the-internal-current-tick.patch
similarity index 87%
rename from Spigot-Server-Patches/0407-Expose-the-internal-current-tick.patch
rename to Spigot-Server-Patches/0409-Expose-the-internal-current-tick.patch
index 3454ec357..334d87c7f 100644
--- a/Spigot-Server-Patches/0407-Expose-the-internal-current-tick.patch
+++ b/Spigot-Server-Patches/0409-Expose-the-internal-current-tick.patch
@@ -1,11 +1,11 @@
-From 1bf364be98d7ded883550eeca361a4efc79238ed Mon Sep 17 00:00:00 2001
+From 9475be31b097c0f33ad62effcb12a20c09ea0044 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 20 Apr 2019 19:47:34 -0500
 Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 18b76ed0f..f3da3a82d 100644
+index 18b76ed0f7..f3da3a82d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2164,5 +2164,10 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0408-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0410-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
similarity index 91%
rename from Spigot-Server-Patches/0408-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
rename to Spigot-Server-Patches/0410-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
index 61a7636d7..9ac80f731 100644
--- a/Spigot-Server-Patches/0408-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
+++ b/Spigot-Server-Patches/0410-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
@@ -1,11 +1,11 @@
-From ecae0134303ae5583c8b982bcad6b2137f268252 Mon Sep 17 00:00:00 2001
+From d40eb01c6996bd57268c7e629d51b48c661bcb42 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 9 Oct 2019 21:51:43 -0500
 Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657)
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1b0ef1442..30380c8db 100644
+index 7fbd390426..f130c5ddc4 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -946,6 +946,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -18,7 +18,7 @@ index 1b0ef1442..30380c8db 100644
              PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver.getWorld());
              this.world.getServer().getPluginManager().callEvent(changeEvent);
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f702619aa..7b79ee4fe 100644
+index f702619aa2..7b79ee4fe5 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -729,6 +729,8 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0409-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0411-Add-option-to-disable-pillager-patrols.patch
similarity index 91%
rename from Spigot-Server-Patches/0409-Add-option-to-disable-pillager-patrols.patch
rename to Spigot-Server-Patches/0411-Add-option-to-disable-pillager-patrols.patch
index f0cd98d62..ffe83c624 100644
--- a/Spigot-Server-Patches/0409-Add-option-to-disable-pillager-patrols.patch
+++ b/Spigot-Server-Patches/0411-Add-option-to-disable-pillager-patrols.patch
@@ -1,11 +1,11 @@
-From 18bd737e8991b816105348051466a01efdbdbf35 Mon Sep 17 00:00:00 2001
+From e6641e24e4766c40da83fe32e8860f9dcc6a3ddb Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 9 Oct 2019 21:46:15 -0500
 Subject: [PATCH] Add option to disable pillager patrols
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c0af1aaf3..dbc645ebb 100644
+index c0af1aaf3b..dbc645ebbe 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -626,4 +626,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index c0af1aaf3..dbc645ebb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
-index 59161143b..f155179ad 100644
+index 59161143b3..f155179ad4 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
 @@ -9,6 +9,7 @@ public class MobSpawnerPatrol {
diff --git a/Spigot-Server-Patches/0410-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0412-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 92%
rename from Spigot-Server-Patches/0410-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to Spigot-Server-Patches/0412-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
index a883d4e1e..94b47c03b 100644
--- a/Spigot-Server-Patches/0410-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
+++ b/Spigot-Server-Patches/0412-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
@@ -1,4 +1,4 @@
-From cb0fd78af1de7f392b3f0eb9806baca978e20b89 Mon Sep 17 00:00:00 2001
+From 6e91204372f7870277c5f84657a6dd4b34c9afee Mon Sep 17 00:00:00 2001
 From: Lukasz Derlatka <toranktto@gmail.com>
 Date: Mon, 11 Nov 2019 16:08:13 +0100
 Subject: [PATCH] Fix AssertionError when player hand set to empty type
@@ -7,7 +7,7 @@ Fixes an AssertionError when setting the player's item in hand to null or a new
 Fixes GH-2718
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e3c562a63..80219f2df 100644
+index e3c562a63b..80219f2df1 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1886,6 +1886,7 @@ public abstract class EntityLiving extends Entity {
@@ -19,7 +19,7 @@ index e3c562a63..80219f2df 100644
          if (enumhand == EnumHand.MAIN_HAND) {
              return this.getEquipment(EnumItemSlot.MAINHAND);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8c54022e0..c559a7b95 100644
+index f6fbba36f4..a1ce2d2e07 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1429,6 +1429,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0411-Prevent-TRAP-while-loading-Fireballs.patch b/Spigot-Server-Patches/0413-Prevent-TRAP-while-loading-Fireballs.patch
similarity index 90%
rename from Spigot-Server-Patches/0411-Prevent-TRAP-while-loading-Fireballs.patch
rename to Spigot-Server-Patches/0413-Prevent-TRAP-while-loading-Fireballs.patch
index 755393d0b..f7a0ca101 100644
--- a/Spigot-Server-Patches/0411-Prevent-TRAP-while-loading-Fireballs.patch
+++ b/Spigot-Server-Patches/0413-Prevent-TRAP-while-loading-Fireballs.patch
@@ -1,11 +1,11 @@
-From 2515940c05e1f56035eb8ffd09f9848faf312900 Mon Sep 17 00:00:00 2001
+From a8eee874aed5c9b5fde29bbb0ad160be44953d10 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 14 Dec 2019 01:10:45 +0000
 Subject: [PATCH] Prevent TRAP while loading Fireballs
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityFireballFireball.java b/src/main/java/net/minecraft/server/EntityFireballFireball.java
-index 3988e68d4..a16b756a0 100644
+index 3988e68d4f..a16b756a05 100644
 --- a/src/main/java/net/minecraft/server/EntityFireballFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityFireballFireball.java
 @@ -19,7 +19,7 @@ public abstract class EntityFireballFireball extends EntityFireball {
diff --git a/Spigot-Server-Patches/0412-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0414-PlayerLaunchProjectileEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0412-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0414-PlayerLaunchProjectileEvent.patch
index 2022f8187..646b05090 100644
--- a/Spigot-Server-Patches/0412-PlayerLaunchProjectileEvent.patch
+++ b/Spigot-Server-Patches/0414-PlayerLaunchProjectileEvent.patch
@@ -1,11 +1,11 @@
-From acafe8ad3e296235f669e51c4cc8a07aa1a3a485 Mon Sep 17 00:00:00 2001
+From 551aae7bfa26f24179eba157f306c68bd7a03d18 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 03:11:03 -0500
 Subject: [PATCH] PlayerLaunchProjectileEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/InteractionResultWrapper.java b/src/main/java/net/minecraft/server/InteractionResultWrapper.java
-index a6b96456b..712bda122 100644
+index a6b96456bc..712bda1225 100644
 --- a/src/main/java/net/minecraft/server/InteractionResultWrapper.java
 +++ b/src/main/java/net/minecraft/server/InteractionResultWrapper.java
 @@ -10,6 +10,7 @@ public class InteractionResultWrapper<T> {
@@ -17,7 +17,7 @@ index a6b96456b..712bda122 100644
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/ItemEgg.java b/src/main/java/net/minecraft/server/ItemEgg.java
-index 89d399c9f..15a536dab 100644
+index 89d399c9ff..15a536dab8 100644
 --- a/src/main/java/net/minecraft/server/ItemEgg.java
 +++ b/src/main/java/net/minecraft/server/ItemEgg.java
 @@ -16,13 +16,32 @@ public class ItemEgg extends Item {
@@ -55,7 +55,7 @@ index 89d399c9f..15a536dab 100644
          return InteractionResultWrapper.a(itemstack);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemEnderPearl.java b/src/main/java/net/minecraft/server/ItemEnderPearl.java
-index 315e01274..34ad0c119 100644
+index 315e012740..34ad0c1190 100644
 --- a/src/main/java/net/minecraft/server/ItemEnderPearl.java
 +++ b/src/main/java/net/minecraft/server/ItemEnderPearl.java
 @@ -16,22 +16,37 @@ public class ItemEnderPearl extends Item {
@@ -107,7 +107,7 @@ index 315e01274..34ad0c119 100644
          return InteractionResultWrapper.a(itemstack);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemExpBottle.java b/src/main/java/net/minecraft/server/ItemExpBottle.java
-index f83eb5c45..1bcf58292 100644
+index f83eb5c45e..1bcf582922 100644
 --- a/src/main/java/net/minecraft/server/ItemExpBottle.java
 +++ b/src/main/java/net/minecraft/server/ItemExpBottle.java
 @@ -15,19 +15,38 @@ public class ItemExpBottle extends Item {
@@ -152,7 +152,7 @@ index f83eb5c45..1bcf58292 100644
          return InteractionResultWrapper.a(itemstack);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemLingeringPotion.java b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
-index c19b678cf..7672e31fc 100644
+index c19b678cfb..7672e31fc0 100644
 --- a/src/main/java/net/minecraft/server/ItemLingeringPotion.java
 +++ b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
 @@ -8,7 +8,11 @@ public class ItemLingeringPotion extends ItemPotionThrowable {
@@ -170,7 +170,7 @@ index c19b678cf..7672e31fc 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/ItemPotionThrowable.java b/src/main/java/net/minecraft/server/ItemPotionThrowable.java
-index 8f8f31b26..72dcf109f 100644
+index 8f8f31b265..72dcf109f6 100644
 --- a/src/main/java/net/minecraft/server/ItemPotionThrowable.java
 +++ b/src/main/java/net/minecraft/server/ItemPotionThrowable.java
 @@ -15,13 +15,31 @@ public class ItemPotionThrowable extends ItemPotion {
@@ -207,7 +207,7 @@ index 8f8f31b26..72dcf109f 100644
          return InteractionResultWrapper.a(itemstack);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemSnowball.java b/src/main/java/net/minecraft/server/ItemSnowball.java
-index abbf2b788..4ad285696 100644
+index abbf2b7881..4ad2856961 100644
 --- a/src/main/java/net/minecraft/server/ItemSnowball.java
 +++ b/src/main/java/net/minecraft/server/ItemSnowball.java
 @@ -17,18 +17,27 @@ public class ItemSnowball extends Item {
@@ -244,7 +244,7 @@ index abbf2b788..4ad285696 100644
          /*
          if (!entityhuman.abilities.canInstantlyBuild) {
 diff --git a/src/main/java/net/minecraft/server/ItemSplashPotion.java b/src/main/java/net/minecraft/server/ItemSplashPotion.java
-index 18bd846ce..e71e933ff 100644
+index 18bd846cee..e71e933fff 100644
 --- a/src/main/java/net/minecraft/server/ItemSplashPotion.java
 +++ b/src/main/java/net/minecraft/server/ItemSplashPotion.java
 @@ -8,7 +8,11 @@ public class ItemSplashPotion extends ItemPotionThrowable {
@@ -262,5 +262,5 @@ index 18bd846ce..e71e933ff 100644
      }
  }
 -- 
-2.22.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0413-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0415-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 88%
rename from Spigot-Server-Patches/0413-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to Spigot-Server-Patches/0415-Add-CraftMagicNumbers.isSupportedApiVersion.patch
index de95508d0..c7ebee30d 100644
--- a/Spigot-Server-Patches/0413-Add-CraftMagicNumbers.isSupportedApiVersion.patch
+++ b/Spigot-Server-Patches/0415-Add-CraftMagicNumbers.isSupportedApiVersion.patch
@@ -1,11 +1,11 @@
-From 44e4be932907ddf286204247fc0bfd3d84dff770 Mon Sep 17 00:00:00 2001
+From 282e173cf881d87529c4a355631d875991247e2b Mon Sep 17 00:00:00 2001
 From: BlackHole <black-hole@live.com>
 Date: Sun, 15 Dec 2019 19:12:39 +0100
 Subject: [PATCH] Add CraftMagicNumbers.isSupportedApiVersion()
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 21bfdf9e7..ab5c6e92e 100644
+index 21bfdf9e71..ab5c6e92ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -298,6 +298,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -21,5 +21,5 @@ index 21bfdf9e7..ab5c6e92e 100644
  
      /**
 -- 
-2.24.1.windows.2
+2.24.1
 
diff --git a/Spigot-Server-Patches/0414-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch b/Spigot-Server-Patches/0416-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
similarity index 89%
rename from Spigot-Server-Patches/0414-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
rename to Spigot-Server-Patches/0416-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
index 0abfadff8..0b95b7abf 100644
--- a/Spigot-Server-Patches/0414-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
+++ b/Spigot-Server-Patches/0416-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
@@ -1,4 +1,4 @@
-From 404c8ec69e874c98023af9914dd56c7863dbc99a Mon Sep 17 00:00:00 2001
+From e9ded59f2d2f5dfeaa0c9997ba6478a3f7b1bc59 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 03:39:51 -0400
 Subject: [PATCH] Avoid Chunk Lookups for Entity/TileEntity Current Chunk
@@ -14,10 +14,10 @@ to the object directly on the Entity/TileEntity object we can directly grab.
 Use that local value instead to reduce lookups in many hot places.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 985f30372..67159b8a8 100644
+index 0baa884bbf..373ea71e64 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -776,7 +776,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -784,7 +784,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
              if (!tileentity.isRemoved() && tileentity.hasWorld()) {
                  BlockPosition blockposition = tileentity.getPosition();
  
@@ -26,7 +26,7 @@ index 985f30372..67159b8a8 100644
                      try {
                          gameprofilerfiller.a(() -> {
                              return String.valueOf(TileEntityTypes.a(tileentity.getTileType()));
-@@ -815,8 +815,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -823,8 +823,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
                  this.tileEntityListTick.remove(tileTickPosition--);
                  // Spigot end
                  //this.tileEntityList.remove(tileentity); // Paper - remove unused list
@@ -40,7 +40,7 @@ index 985f30372..67159b8a8 100644
                  }
              }
          }
-@@ -836,8 +839,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -844,8 +847,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
                      }
                      // CraftBukkit end */
  
@@ -52,10 +52,10 @@ index 985f30372..67159b8a8 100644
  
                          chunk.setTileEntity(tileentity1.getPosition(), tileentity1);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 83fb8737a..c473c7d16 100644
+index 3739a95c5a..1e00908671 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1384,9 +1384,12 @@ public class WorldServer extends World {
+@@ -1390,9 +1390,12 @@ public class WorldServer extends World {
      }
  
      private void removeEntityFromChunk(Entity entity) {
diff --git a/Spigot-Server-Patches/0415-Fix-spawn-radius-being-treated-as-0.patch b/Spigot-Server-Patches/0417-Fix-spawn-radius-being-treated-as-0.patch
similarity index 91%
rename from Spigot-Server-Patches/0415-Fix-spawn-radius-being-treated-as-0.patch
rename to Spigot-Server-Patches/0417-Fix-spawn-radius-being-treated-as-0.patch
index 6aba109b0..b735836d7 100644
--- a/Spigot-Server-Patches/0415-Fix-spawn-radius-being-treated-as-0.patch
+++ b/Spigot-Server-Patches/0417-Fix-spawn-radius-being-treated-as-0.patch
@@ -1,11 +1,11 @@
-From e066283106f45fb528cc713204b965fbd789906c Mon Sep 17 00:00:00 2001
+From edc43ace428a80cd988fcae335e14377f08a0cd4 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 15 Dec 2019 19:41:28 +0000
 Subject: [PATCH] Fix spawn radius being treated as 0
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 30380c8db..d379bacac 100644
+index f130c5ddc4..ed6f1b1a3e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -123,7 +123,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {