[CI-SKIP] Rebuild patches

45 files changed, 88 insertions, 88 deletions

diff --git a/Spigot-Server-Patches/0375-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0374-Optimize-Captured-TileEntity-Lookup.patch
index a3030d33d2..4a29a5cf18 100644
--- a/Spigot-Server-Patches/0375-Optimize-Captured-TileEntity-Lookup.patch
+++ b/Spigot-Server-Patches/0374-Optimize-Captured-TileEntity-Lookup.patch
@@ -1,4 +1,4 @@
-From 21758385418502c81a934bb3604ff94d733f5d85 Mon Sep 17 00:00:00 2001
+From 44377891791b199d2a2e184c905942fe07ae24a5 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 6 Apr 2019 10:16:48 -0400
 Subject: [PATCH] Optimize Captured TileEntity Lookup
@@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index dad0c893fd..dd2a9c6e59 100644
+index dad0c893f..dd2a9c6e5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1082,12 +1082,13 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -31,5 +31,5 @@ index dad0c893fd..dd2a9c6e59 100644
              if (this.tickingTileEntities) {
                  tileentity = this.A(blockposition);
 -- 
-2.22.0
+2.23.0
 
diff --git a/Spigot-Server-Patches/0376-Add-Heightmap-API.patch b/Spigot-Server-Patches/0375-Add-Heightmap-API.patch
index bb7febcbdc..c74e00f8c1 100644
--- a/Spigot-Server-Patches/0376-Add-Heightmap-API.patch
+++ b/Spigot-Server-Patches/0375-Add-Heightmap-API.patch
@@ -1,4 +1,4 @@
-From d31426814089ec50b9ef2091354fb28b73ff61d3 Mon Sep 17 00:00:00 2001
+From f06f54d764843bcf4bbf02061fbc9cea4a0bbe63 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Tue, 1 Jan 2019 02:22:01 -0800
 Subject: [PATCH] Add Heightmap API
@@ -20,7 +20,7 @@ index dd2a9c6e5..e3b4e30e6 100644
  
          if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0b891cd0f..48365737b 100644
+index 89e86c2cd..ab357095d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -338,6 +338,29 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0377-Handle-bad-chunks-more-gracefully.patch b/Spigot-Server-Patches/0376-Handle-bad-chunks-more-gracefully.patch
index a5bc016253..78a967a017 100644
--- a/Spigot-Server-Patches/0377-Handle-bad-chunks-more-gracefully.patch
+++ b/Spigot-Server-Patches/0376-Handle-bad-chunks-more-gracefully.patch
@@ -1,4 +1,4 @@
-From 0fbd3c1b72d52dbca3781d93ab9bfa5681a3f4cb Mon Sep 17 00:00:00 2001
+From b03aa2b2428cf6e504fe4f069f208679e666676f Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Mon, 15 Apr 2019 02:24:52 +0100
 Subject: [PATCH] Handle bad chunks more gracefully
@@ -15,7 +15,7 @@ Should Mojang choose to alter this behavior in the future, this change
 will simply defer to whatever that new behavior is.
 
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index c53518a477..6f34d8aea0 100644
+index c53518a47..6f34d8aea 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -171,8 +171,21 @@ public abstract class RegionFileCache implements AutoCloseable {
@@ -59,5 +59,5 @@ index c53518a477..6f34d8aea0 100644
  
              nbttagcompound = null;
 -- 
-2.22.0
+2.23.0
 
diff --git a/Spigot-Server-Patches/0378-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0377-Mob-Spawner-API-Enhancements.patch
index 8dd134dccc..978d94299b 100644
--- a/Spigot-Server-Patches/0378-Mob-Spawner-API-Enhancements.patch
+++ b/Spigot-Server-Patches/0377-Mob-Spawner-API-Enhancements.patch
@@ -1,11 +1,11 @@
-From 98d05ca6b896bc5aead03a7402b365bb5f631abe Mon Sep 17 00:00:00 2001
+From e44fa7d596b9d2d5a3f39a0d377d0f9606248d9c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <[email protected]>
 Date: Fri, 19 Apr 2019 12:41:13 -0500
 Subject: [PATCH] Mob Spawner API Enhancements
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 079099e308..b05f6c2f2b 100644
+index 079099e30..b05f6c2f2 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -46,6 +46,7 @@ public abstract class MobSpawnerAbstract {
@@ -82,7 +82,7 @@ index 079099e308..b05f6c2f2b 100644
              nbttagcompound.setShort("MaxNearbyEntities", (short) this.maxNearbyEntities);
              nbttagcompound.setShort("RequiredPlayerRange", (short) this.requiredPlayerRange);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
-index 5c4c3c70c7..e78e3804ba 100644
+index 5c4c3c70c..e78e3804b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
 @@ -121,4 +121,16 @@ public class CraftCreatureSpawner extends CraftBlockEntityState<TileEntityMobSpa
@@ -103,5 +103,5 @@ index 5c4c3c70c7..e78e3804ba 100644
 +    // Paper end
  }
 -- 
-2.22.0
+2.23.0
 
diff --git a/Spigot-Server-Patches/0379-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0378-Per-Player-View-Distance-API-placeholders.patch
index bd2d89da78..e7c062678d 100644
--- a/Spigot-Server-Patches/0379-Per-Player-View-Distance-API-placeholders.patch
+++ b/Spigot-Server-Patches/0378-Per-Player-View-Distance-API-placeholders.patch
@@ -1,4 +1,4 @@
-From 14bd1135ed355b728586d6237f8d7117124ccb63 Mon Sep 17 00:00:00 2001
+From 169c744e147e554e58feafd2c9ccb990eb99e5fa Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Mon, 6 May 2019 01:29:25 -0400
 Subject: [PATCH] Per-Player View Distance API placeholders
@@ -7,7 +7,7 @@ I hope to look at this more in-depth soon. It appears doable.
 However this should not block the update.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index c2f35f89d3..c8c74f2b3e 100644
+index c2f35f89d..c8c74f2b3 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -570,9 +570,9 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -23,7 +23,7 @@ index c2f35f89d3..c8c74f2b3e 100644
                      double deltaX = this.locX - player.locX;
                      double deltaZ = this.locZ - player.locZ;
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 18151acd5d..8b3052b113 100644
+index 18151acd5..8b3052b11 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -208,9 +208,9 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -39,7 +39,7 @@ index 18151acd5d..8b3052b113 100644
                      double deltaX = this.locX - player.locX;
                      double deltaZ = this.locZ - player.locZ;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9fa55ef6f7..e920545df1 100644
+index 9fa55ef6f..e920545df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1983,6 +1983,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -60,5 +60,5 @@ index 9fa55ef6f7..e920545df1 100644
  
      // Spigot start
 -- 
-2.22.0
+2.23.0
 
diff --git a/Spigot-Server-Patches/0380-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0379-Fix-CB-call-to-changed-postToMainThread-method.patch
index 276ea42449..c3470e45f8 100644
--- a/Spigot-Server-Patches/0380-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/Spigot-Server-Patches/0379-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -1,11 +1,11 @@
-From 4248f97eb65fef4cc66def1ab94ce98b5c26d154 Mon Sep 17 00:00:00 2001
+From 77e3bff66143458b16f6ddfb0510d254faecf0c4 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Fri, 10 May 2019 18:38:19 +0100
 Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7680b88024..4187ba05bd 100644
+index 37b97438c..4a16d6c14 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -283,7 +283,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -18,5 +18,5 @@ index 7680b88024..4187ba05bd 100644
  
      @Override
 -- 
-2.22.1
+2.23.0
 
diff --git a/Spigot-Server-Patches/0381-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0380-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index fda4ce860a..45c7bd5fe9 100644
--- a/Spigot-Server-Patches/0381-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/Spigot-Server-Patches/0380-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
@@ -1,4 +1,4 @@
-From c0175bc340b6ecab247b4972d98d21cc1a25e7ae Mon Sep 17 00:00:00 2001
+From 0af4cd795675fc8e5128e0648464aab87edf887c Mon Sep 17 00:00:00 2001
 From: Phoenix616 <[email protected]>
 Date: Sat, 27 Apr 2019 20:00:43 +0100
 Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
 This also fixes the adding sound playing when the item frame direction is changed.
 
 diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java
-index 6f6837ec4d..b078435c6f 100644
+index 6f6837ec4..b078435c6 100644
 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java
 +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
 @@ -226,7 +226,7 @@ public class EntityItemFrame extends EntityHanging {
@@ -19,7 +19,7 @@ index 6f6837ec4d..b078435c6f 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
-index 799036f268..9ad180d946 100644
+index 799036f26..9ad180d94 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
 @@ -49,7 +49,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
@@ -32,5 +32,5 @@ index 799036f268..9ad180d946 100644
          this.entity = frame;
      }
 -- 
-2.22.1
+2.23.0
 
diff --git a/Spigot-Server-Patches/0382-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0381-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
index 750b7a8141..8e6a75aad4 100644
--- a/Spigot-Server-Patches/0382-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
+++ b/Spigot-Server-Patches/0381-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
@@ -1,4 +1,4 @@
-From 0e44f004120cb2ed3216a97092e6da88f4233340 Mon Sep 17 00:00:00 2001
+From 3de070a84f4e03c4f82c2538e87c3ac3c7da769a Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Mon, 13 May 2019 21:10:59 -0700
 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer
@@ -16,7 +16,7 @@ handling that should have been handled synchronously will be handled
 synchronously when the server gets shut down.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 35c5d38c21..c70ab3caf0 100644
+index 35c5d38c2..c70ab3caf 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2154,7 +2154,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -29,7 +29,7 @@ index 35c5d38c21..c70ab3caf0 100644
  
      @Deprecated
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b89486beb1..7a8ab7d401 100644
+index b89486beb..7a8ab7d40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1664,7 +1664,7 @@ public final class CraftServer implements Server {
@@ -42,5 +42,5 @@ index b89486beb1..7a8ab7d401 100644
  
      @Override
 -- 
-2.22.1
+2.23.0
 
diff --git a/Spigot-Server-Patches/0383-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0382-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
index 4be009cd56..34a55d282f 100644
--- a/Spigot-Server-Patches/0383-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0382-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
@@ -1,4 +1,4 @@
-From fe0d3a1329061e1007cac3067f00b4a3066cb1e2 Mon Sep 17 00:00:00 2001
+From a4c0b7de4a7511ca1d34e6fb34749ae1b478c880 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 28 Sep 2018 21:49:53 -0400
 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks
@@ -19,7 +19,7 @@ This change ensures the chunks are always loaded when entities are
 added to the world, or a valid entity moves between chunks.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 192b3be1f0..82c3bc60d0 100644
+index 956740dcd..55ae4abc1 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -640,7 +640,7 @@ public class WorldServer extends World {
@@ -41,5 +41,5 @@ index 192b3be1f0..82c3bc60d0 100644
              if (!(ichunkaccess instanceof Chunk)) {
                  return false;
 -- 
-2.22.1
+2.23.0
 
diff --git a/Spigot-Server-Patches/0384-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0383-Duplicate-UUID-Resolve-Option.patch
index af61863497..66da089ce6 100644
--- a/Spigot-Server-Patches/0384-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0383-Duplicate-UUID-Resolve-Option.patch
@@ -1,4 +1,4 @@
-From 49178a3ce45aee1bb899329fa26d782c53579a62 Mon Sep 17 00:00:00 2001
+From 89c54241d1f31d6d2c9f92c16fbb3a38e58d6e0e Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
diff --git a/Spigot-Server-Patches/0385-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0384-improve-CraftWorld-isChunkLoaded.patch
index 2b6539a0b3..20645ad09e 100644
--- a/Spigot-Server-Patches/0385-improve-CraftWorld-isChunkLoaded.patch
+++ b/Spigot-Server-Patches/0384-improve-CraftWorld-isChunkLoaded.patch
@@ -1,4 +1,4 @@
-From 867ec51a5786f5870834e23afdc68c9185b05456 Mon Sep 17 00:00:00 2001
+From baa3dd45ad57cf4059302cee17998fa773a5bb22 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Tue, 21 May 2019 02:34:04 +0100
 Subject: [PATCH] improve CraftWorld#isChunkLoaded
@@ -9,7 +9,7 @@ waiting for the execution queue to get to our request; We can just query
 the chunk status and get a response now, vs having to wait
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 48365737b..67f0f9a89 100644
+index ab357095d..38939ce81 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -402,14 +402,13 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0386-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0385-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 7794620b1f..088374345e 100644
--- a/Spigot-Server-Patches/0386-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0385-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 98fee3fca57d0ba5ee3f5aaee63d03ca99cf8063 Mon Sep 17 00:00:00 2001
+From b4155a3581c39d61d4eab95e5a6103d77924fe37 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -226,5 +226,5 @@ index 38939ce81..0c31c349a 100644
  
      @Override
 -- 
-2.22.1
+2.23.0
 
diff --git a/Spigot-Server-Patches/0387-Fix-some-generation-concurrency-issues.patch b/Spigot-Server-Patches/0386-Fix-some-generation-concurrency-issues.patch
index 3b44f6f0cf..75a15c5a44 100644
--- a/Spigot-Server-Patches/0387-Fix-some-generation-concurrency-issues.patch
+++ b/Spigot-Server-Patches/0386-Fix-some-generation-concurrency-issues.patch
@@ -1,4 +1,4 @@
-From b5f68bce15b03752bc7ceca98de47efcb5fe6468 Mon Sep 17 00:00:00 2001
+From 7e0cc05d027bb79c8a9e1e3fbe644421570e3bd5 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Fri, 24 May 2019 07:53:16 +0100
 Subject: [PATCH] Fix some generation concurrency issues
diff --git a/Spigot-Server-Patches/0388-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0387-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
index 99d5655ffa..bc38b0088d 100644
--- a/Spigot-Server-Patches/0388-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
+++ b/Spigot-Server-Patches/0387-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
@@ -1,4 +1,4 @@
-From 4eadaf6901010d0f29d2a1e8705c28a07d454e8b Mon Sep 17 00:00:00 2001
+From 829f83cc7a910c4c2b7669b98d26324284495d20 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <[email protected]>
 Date: Mon, 27 May 2019 17:35:39 -0500
 Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative
@@ -6,7 +6,7 @@ Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
-index 3a8e105336..fe527aba52 100644
+index 3a8e10533..fe527aba5 100644
 --- a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
 +++ b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
 @@ -175,6 +175,12 @@ public class EntityAreaEffectCloud extends Entity {
@@ -23,5 +23,5 @@ index 3a8e105336..fe527aba52 100644
          if (this.world.isClientSide) {
              ParticleParam particleparam = this.getParticle();
 -- 
-2.22.1
+2.23.0
 
diff --git a/Spigot-Server-Patches/0389-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0388-ChunkMapDistance-CME.patch
index 23bd3daaa8..c1e3bc7236 100644
--- a/Spigot-Server-Patches/0389-ChunkMapDistance-CME.patch
+++ b/Spigot-Server-Patches/0388-ChunkMapDistance-CME.patch
@@ -1,11 +1,11 @@
-From 1536a61c14cc5fe7df1f034bf0f64eaabb8bb1f8 Mon Sep 17 00:00:00 2001
+From f740ce691e50b45b0fb0b729ce92c5e1ead81226 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Wed, 29 May 2019 04:01:22 +0100
 Subject: [PATCH] ChunkMapDistance CME
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
-index 101eb58ace..63a688725e 100644
+index 101eb58ac..63a688725 100644
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
 @@ -36,7 +36,7 @@ public abstract class ChunkMapDistance {
@@ -50,5 +50,5 @@ index 101eb58ace..63a688725e 100644
          } else {
              if (!this.l.isEmpty()) {
 -- 
-2.22.1
+2.23.0
 
diff --git a/Spigot-Server-Patches/0390-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0389-Implement-CraftBlockSoundGroup.patch
index 1603e452df..ded6d3ad5e 100644
--- a/Spigot-Server-Patches/0390-Implement-CraftBlockSoundGroup.patch
+++ b/Spigot-Server-Patches/0389-Implement-CraftBlockSoundGroup.patch
@@ -1,4 +1,4 @@
-From 3d6591b285cbe5e769d02e69c51098ccdd2318bf Mon Sep 17 00:00:00 2001
+From df2c2f7e72bb4e4b57873c0f9ccf6cec357f3270 Mon Sep 17 00:00:00 2001
 From: simpleauthority <[email protected]>
 Date: Tue, 28 May 2019 03:48:51 -0700
 Subject: [PATCH] Implement CraftBlockSoundGroup
diff --git a/Spigot-Server-Patches/0391-Chunk-debug-command.patch b/Spigot-Server-Patches/0390-Chunk-debug-command.patch
index e75ec876e8..ae8bd6f69e 100644
--- a/Spigot-Server-Patches/0391-Chunk-debug-command.patch
+++ b/Spigot-Server-Patches/0390-Chunk-debug-command.patch
@@ -1,4 +1,4 @@
-From 307b9c67d6789626657f0f2c126955fa43d9a9ae Mon Sep 17 00:00:00 2001
+From 088a41c5187b453e76e79602312b89ae1bcfac13 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Sat, 1 Jun 2019 13:00:55 -0700
 Subject: [PATCH] Chunk debug command
diff --git a/Spigot-Server-Patches/0392-incremental-chunk-saving.patch b/Spigot-Server-Patches/0391-incremental-chunk-saving.patch
index 7e39aa93fe..c1b16f091d 100644
--- a/Spigot-Server-Patches/0392-incremental-chunk-saving.patch
+++ b/Spigot-Server-Patches/0391-incremental-chunk-saving.patch
@@ -1,4 +1,4 @@
-From 26ce15746427d11172e35f35ec78b26c4af5b153 Mon Sep 17 00:00:00 2001
+From 7f430df08b80759b01c0a2db3938dc79d0858816 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sun, 9 Jun 2019 03:53:22 +0100
 Subject: [PATCH] incremental chunk saving
@@ -147,7 +147,7 @@ index 493770bf6..2be6fa0f0 100644
          if (flag) {
              List<PlayerChunk> list = (List) this.visibleChunks.values().stream().filter(PlayerChunk::hasBeenLoaded).peek(PlayerChunk::m).collect(Collectors.toList());
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 8ac49d8b9..9fd14b573 100644
+index 8a3124fed..e4cc24806 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -756,11 +756,44 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0393-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0392-Catch-exceptions-from-dispenser-entity-spawns.patch
index d62d0077b7..335959bc28 100644
--- a/Spigot-Server-Patches/0393-Catch-exceptions-from-dispenser-entity-spawns.patch
+++ b/Spigot-Server-Patches/0392-Catch-exceptions-from-dispenser-entity-spawns.patch
@@ -1,4 +1,4 @@
-From 9b6be5334841e6f0c2214dcf8476765148c8ac2f Mon Sep 17 00:00:00 2001
+From a911f20edaee814e98234f9f00ab408520f5fa70 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Mon, 10 Jun 2019 09:36:40 +0100
 Subject: [PATCH] Catch exceptions from dispenser entity spawns
diff --git a/Spigot-Server-Patches/0394-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0393-Fix-World-isChunkGenerated-calls.patch
index c428a6ae4f..f3b7930fa8 100644
--- a/Spigot-Server-Patches/0394-Fix-World-isChunkGenerated-calls.patch
+++ b/Spigot-Server-Patches/0393-Fix-World-isChunkGenerated-calls.patch
@@ -1,4 +1,4 @@
-From 431147e9f64a4ffe67f25ed2dfdccf8469e92ff0 Mon Sep 17 00:00:00 2001
+From 169cff9d2e106cf7ab54e52714a6731053f2cbfa Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Sat, 15 Jun 2019 08:54:33 -0700
 Subject: [PATCH] Fix World#isChunkGenerated calls
@@ -279,7 +279,7 @@ index 6f34d8aea..d2b328945 100644
                      printOversizedLog("ChunkTooLarge even after reduction. Trying in overzealous mode.", regionfile.file, chunkX, chunkZ);
                      // Eek, major fail. We have retry logic, so reduce threshholds and fall back
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c49b74c68..088f0800f 100644
+index 0c31c349a..4a035f0f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -18,6 +18,7 @@ import java.util.Objects;
diff --git a/Spigot-Server-Patches/0395-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0394-Show-blockstate-location-if-we-failed-to-read-it.patch
index bfcdaecf37..13a8b31656 100644
--- a/Spigot-Server-Patches/0395-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/Spigot-Server-Patches/0394-Show-blockstate-location-if-we-failed-to-read-it.patch
@@ -1,4 +1,4 @@
-From 7ebd3f6dcc789d74cf8ed5aa770c2d0bc60eac64 Mon Sep 17 00:00:00 2001
+From 95a4a73b24ce202917135f029e05fdbea3566a74 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Sat, 15 Jun 2019 10:28:25 -0700
 Subject: [PATCH] Show blockstate location if we failed to read it
diff --git a/Spigot-Server-Patches/0396-Log-other-thread-in-DataPaletteBlock-lock-failure.patch b/Spigot-Server-Patches/0395-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
index 9f55f2c9c6..a269d74fbc 100644
--- a/Spigot-Server-Patches/0396-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
+++ b/Spigot-Server-Patches/0395-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
@@ -1,4 +1,4 @@
-From ce1df3bf2a50b3f194aa24860fcb3a1f5c41d52d Mon Sep 17 00:00:00 2001
+From 62aa6178ba9d9f06db5d13ef1d6382cd8b16b5c6 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Fri, 21 Jun 2019 14:42:48 -0700
 Subject: [PATCH] Log other thread in DataPaletteBlock lock failure
diff --git a/Spigot-Server-Patches/0397-Use-ChunkStatus-cache-when-saving-protochunks.patch b/Spigot-Server-Patches/0396-Use-ChunkStatus-cache-when-saving-protochunks.patch
index 337dc59abf..9fd6b6c516 100644
--- a/Spigot-Server-Patches/0397-Use-ChunkStatus-cache-when-saving-protochunks.patch
+++ b/Spigot-Server-Patches/0396-Use-ChunkStatus-cache-when-saving-protochunks.patch
@@ -1,4 +1,4 @@
-From 7e3412b5e8d6b3c6bad18965ec3b4f9159e70433 Mon Sep 17 00:00:00 2001
+From 03e8755740d9f2ccd80b90149c5b8a5a47ae4967 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Sat, 22 Jun 2019 04:20:47 -0700
 Subject: [PATCH] Use ChunkStatus cache when saving protochunks
diff --git a/Spigot-Server-Patches/0398-Anti-Xray.patch b/Spigot-Server-Patches/0397-Anti-Xray.patch
index a515271651..e85845289b 100644
--- a/Spigot-Server-Patches/0398-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0397-Anti-Xray.patch
@@ -1,4 +1,4 @@
-From 6013f2d16d7d537fa82ae5fc0895933683a8f56a Mon Sep 17 00:00:00 2001
+From 85ac131a4f40d3ec4f7ead19f679a5305c176712 Mon Sep 17 00:00:00 2001
 From: stonar96 <[email protected]>
 Date: Mon, 20 Aug 2018 03:03:58 +0200
 Subject: [PATCH] Anti-Xray
diff --git a/Spigot-Server-Patches/0399-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0398-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index 7aea1d71c8..5f10df5ea7 100644
--- a/Spigot-Server-Patches/0399-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/Spigot-Server-Patches/0398-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -1,4 +1,4 @@
-From d3a78fe7d2131aef6839200e27885e872b431700 Mon Sep 17 00:00:00 2001
+From f41d7766a36000409d56845cb8dc499add954acf Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 24 Mar 2019 01:01:32 -0400
 Subject: [PATCH] Only count Natural Spawned mobs towards natural spawn mob
@@ -38,7 +38,7 @@ index 929f5c303..ff520d9e8 100644
      public boolean asynchronous;
      public EngineMode engineMode;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9fd14b573..1e5b15c2e 100644
+index e4cc24806..8b95da3da 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -899,6 +899,13 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0400-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0399-Use-getChunkIfLoadedImmediately-in-places.patch
index 99b85c42ed..e8acb41c98 100644
--- a/Spigot-Server-Patches/0400-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/Spigot-Server-Patches/0399-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -1,4 +1,4 @@
-From b903049b2197ac40a6bbe48c05f90ff3739eb832 Mon Sep 17 00:00:00 2001
+From 59cfc5788449e1f54560c9c2ff59b4ff2efd6b5d Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Mon, 8 Jul 2019 00:13:36 -0700
 Subject: [PATCH] Use getChunkIfLoadedImmediately in places
@@ -21,7 +21,7 @@ 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 4187ba05b..e7b8b2e99 100644
+index 4a16d6c14..ae17cdf23 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 {
diff --git a/Spigot-Server-Patches/0401-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0400-Configurable-projectile-relative-velocity.patch
index da84f8a1fc..11dcdde5cc 100644
--- a/Spigot-Server-Patches/0401-Configurable-projectile-relative-velocity.patch
+++ b/Spigot-Server-Patches/0400-Configurable-projectile-relative-velocity.patch
@@ -1,4 +1,4 @@
-From 8c98d71b84d9ff04539641bda4802054c11a7246 Mon Sep 17 00:00:00 2001
+From 8a39edd47a4135f609b6b90b41689cf6331961ea Mon Sep 17 00:00:00 2001
 From: Lucavon <[email protected]>
 Date: Tue, 23 Jul 2019 20:29:20 -0500
 Subject: [PATCH] Configurable projectile relative velocity
diff --git a/Spigot-Server-Patches/0402-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0401-Mark-entities-as-being-ticked-when-notifying-navigat.patch
index 77b84cf61d..2f7cb2e155 100644
--- a/Spigot-Server-Patches/0402-Mark-entities-as-being-ticked-when-notifying-navigat.patch
+++ b/Spigot-Server-Patches/0401-Mark-entities-as-being-ticked-when-notifying-navigat.patch
@@ -1,4 +1,4 @@
-From a9927db17c974026c10d565b982495407313c3c3 Mon Sep 17 00:00:00 2001
+From c13373f9e7045463c882bcfddcc39e2f1c6d6712 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sun, 28 Jul 2019 00:51:11 +0100
 Subject: [PATCH] Mark entities as being ticked when notifying navigation
diff --git a/Spigot-Server-Patches/0403-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0402-offset-item-frame-ticking.patch
index 985c38b342..94676f7b94 100644
--- a/Spigot-Server-Patches/0403-offset-item-frame-ticking.patch
+++ b/Spigot-Server-Patches/0402-offset-item-frame-ticking.patch
@@ -1,4 +1,4 @@
-From 5b964c886c2783dd44c93297d132792d17091650 Mon Sep 17 00:00:00 2001
+From 5523a5eb1fe8396a208694a2650d268ec0a8e999 Mon Sep 17 00:00:00 2001
 From: kickash32 <[email protected]>
 Date: Tue, 30 Jul 2019 03:17:16 +0500
 Subject: [PATCH] offset item frame ticking
diff --git a/Spigot-Server-Patches/0404-Preserve-old-flush-on-save-flag-for-reliable-regionf.patch b/Spigot-Server-Patches/0403-Preserve-old-flush-on-save-flag-for-reliable-regionf.patch
index bfd8810b76..13d75040c3 100644
--- a/Spigot-Server-Patches/0404-Preserve-old-flush-on-save-flag-for-reliable-regionf.patch
+++ b/Spigot-Server-Patches/0403-Preserve-old-flush-on-save-flag-for-reliable-regionf.patch
@@ -1,4 +1,4 @@
-From 4c3bca65e308b39ad3f4df22bff48c0d3538b8de Mon Sep 17 00:00:00 2001
+From 98e10786918880c728f3afc751290cdf5eb14cf5 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Mon, 5 Aug 2019 08:24:01 -0700
 Subject: [PATCH] Preserve old flush on save flag for reliable regionfiles
diff --git a/Spigot-Server-Patches/0405-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0404-Avoid-hopper-searches-if-there-are-no-items.patch
index 064a89861c..0608558ffe 100644
--- a/Spigot-Server-Patches/0405-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0404-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -1,4 +1,4 @@
-From 2e3adab90109275dfaa287129668bc5ef2e8a121 Mon Sep 17 00:00:00 2001
+From 60e6a269e9cf67ebe769d2e6885a9afcf826187b Mon Sep 17 00:00:00 2001
 From: CullanP <[email protected]>
 Date: Thu, 3 Mar 2016 02:13:38 -0600
 Subject: [PATCH] Avoid hopper searches if there are no items
diff --git a/Spigot-Server-Patches/0406-Fixed-MC-156852.patch b/Spigot-Server-Patches/0405-Fixed-MC-156852.patch
index 14999d5e2e..e85c66986d 100644
--- a/Spigot-Server-Patches/0406-Fixed-MC-156852.patch
+++ b/Spigot-Server-Patches/0405-Fixed-MC-156852.patch
@@ -1,4 +1,4 @@
-From 7cb4669fb5d991d54e6bfe922fa2e679e47af0d6 Mon Sep 17 00:00:00 2001
+From abe28371a0b9968f867f90f5f1c8a49f52c49588 Mon Sep 17 00:00:00 2001
 From: TheGreatKetchup <[email protected]>
 Date: Thu, 1 Aug 2019 21:24:30 -0400
 Subject: [PATCH] Fixed MC-156852
diff --git a/Spigot-Server-Patches/0407-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0406-Implement-alternative-item-despawn-rate.patch
index e09a3d5f1a..353e969578 100644
--- a/Spigot-Server-Patches/0407-Implement-alternative-item-despawn-rate.patch
+++ b/Spigot-Server-Patches/0406-Implement-alternative-item-despawn-rate.patch
@@ -1,4 +1,4 @@
-From ec3a80e16df92c21e4618cbf79b19fe53125a9da Mon Sep 17 00:00:00 2001
+From c34bcad7cc5485514787db9c141cc08843033381 Mon Sep 17 00:00:00 2001
 From: kickash32 <[email protected]>
 Date: Mon, 3 Jun 2019 02:02:39 -0400
 Subject: [PATCH] Implement alternative item-despawn-rate
diff --git a/Spigot-Server-Patches/0408-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0407-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
index fde749b669..f738699efc 100644
--- a/Spigot-Server-Patches/0408-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
+++ b/Spigot-Server-Patches/0407-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
@@ -1,4 +1,4 @@
-From ab8fa425b78ec7d2d9ddf7fe697015e1e5ab82ac Mon Sep 17 00:00:00 2001
+From ad2c4f712acd7b7bd10e4dae9181cd3edf98b9ca Mon Sep 17 00:00:00 2001
 From: Paul Sauve <[email protected]>
 Date: Sun, 14 Jul 2019 21:05:03 -0500
 Subject: [PATCH] Do less work if we have a custom Bukkit generator
@@ -7,7 +7,7 @@ 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 84c16e275..4497f6a60 100644
+index 6220af6b4..f1ad7be75 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -663,12 +663,6 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0409-Fix-MC-158900.patch b/Spigot-Server-Patches/0408-Fix-MC-158900.patch
index 8f38bd12ac..b026d997c5 100644
--- a/Spigot-Server-Patches/0409-Fix-MC-158900.patch
+++ b/Spigot-Server-Patches/0408-Fix-MC-158900.patch
@@ -1,4 +1,4 @@
-From 2f7aaa74e3eadc5cbb5e0e11789fd82308f363b3 Mon Sep 17 00:00:00 2001
+From 4d67d77e8ac19306f0e4ce1d95f4607ec4901b17 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Tue, 13 Aug 2019 06:35:17 -0700
 Subject: [PATCH] Fix MC-158900
diff --git a/Spigot-Server-Patches/0410-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0409-Asynchronous-chunk-IO-and-loading.patch
index fbc2d2440e..7c61b77db3 100644
--- a/Spigot-Server-Patches/0410-Asynchronous-chunk-IO-and-loading.patch
+++ b/Spigot-Server-Patches/0409-Asynchronous-chunk-IO-and-loading.patch
@@ -1,4 +1,4 @@
-From db3abe86c6ce324523f6779e108e91cf8da1d4fd Mon Sep 17 00:00:00 2001
+From e4054b2c05e5e202875332027ee9bf9a28e0d573 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Sat, 13 Jul 2019 09:23:10 -0700
 Subject: [PATCH] Asynchronous chunk IO and loading
@@ -3867,5 +3867,5 @@ index a1d93200e..6ca0ebfde 100644
                  log.log( Level.SEVERE, "------------------------------" );
                  //
 -- 
-2.22.1
+2.23.0
 
diff --git a/Spigot-Server-Patches/0411-Reduce-sync-loads.patch b/Spigot-Server-Patches/0410-Reduce-sync-loads.patch
index 642301e8f0..cbf364747d 100644
--- a/Spigot-Server-Patches/0411-Reduce-sync-loads.patch
+++ b/Spigot-Server-Patches/0410-Reduce-sync-loads.patch
@@ -1,4 +1,4 @@
-From 3c196746587129644488f1cddf9abdcc10438cb3 Mon Sep 17 00:00:00 2001
+From 4ba2f464ac38d9b7346b8015c8ce6cb74084fc03 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Fri, 19 Jul 2019 03:29:14 -0700
 Subject: [PATCH] Reduce sync loads
@@ -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 69f3159ce..17f04fb81 100644
+index f793ba08e..c8451afec 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 {
@@ -345,5 +345,5 @@ index 0c1f4e6e1..845575f52 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.22.1
+2.23.0
 
diff --git a/Spigot-Server-Patches/0412-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0411-implement-optional-per-player-mob-spawns.patch
index 61262d98c2..27ba7e1aa0 100644
--- a/Spigot-Server-Patches/0412-implement-optional-per-player-mob-spawns.patch
+++ b/Spigot-Server-Patches/0411-implement-optional-per-player-mob-spawns.patch
@@ -1,4 +1,4 @@
-From 838de9697614e9960cc0adf901811992c98cb71f Mon Sep 17 00:00:00 2001
+From 576204ff82d9ca1e4317c2be63e6be359dabf74c Mon Sep 17 00:00:00 2001
 From: kickash32 <[email protected]>
 Date: Mon, 19 Aug 2019 01:27:58 +0500
 Subject: [PATCH] implement optional per player mob spawns
@@ -547,7 +547,7 @@ index 000000000..4f13d3ff8
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 17f04fb81..bc5011312 100644
+index c8451afec..d0606ee74 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -555,7 +555,22 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -645,7 +645,7 @@ index a7fc34f85..612b9b7e3 100644
          return this.ba;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index e6b7c41bf..a6b0fb160 100644
+index 9daf64bad..95ee33513 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -77,7 +77,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -802,5 +802,5 @@ index 845575f52..ee3789b38 100644
  
      @Override
 -- 
-2.22.1
+2.23.0
 
diff --git a/Spigot-Server-Patches/0413-Improve-POI-data-saving-logic.patch b/Spigot-Server-Patches/0412-Improve-POI-data-saving-logic.patch
index f9e5b39087..52d36f27c1 100644
--- a/Spigot-Server-Patches/0413-Improve-POI-data-saving-logic.patch
+++ b/Spigot-Server-Patches/0412-Improve-POI-data-saving-logic.patch
@@ -1,4 +1,4 @@
-From dab99d480ae6b7355408b9313b53db3681fad95e Mon Sep 17 00:00:00 2001
+From cf3689f611fad7d903831b63086deefad3cd8e92 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Mon, 19 Aug 2019 06:33:17 -0700
 Subject: [PATCH] Improve POI data saving logic
@@ -7,7 +7,7 @@ Subject: [PATCH] Improve POI data saving logic
 - Aggressively target unloading
 
 diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java
-index 0e98b7803b..fb99b43061 100644
+index 0e98b7803..fb99b4306 100644
 --- a/src/main/java/net/minecraft/server/VillagePlace.java
 +++ b/src/main/java/net/minecraft/server/VillagePlace.java
 @@ -132,9 +132,12 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
@@ -26,5 +26,5 @@ index 0e98b7803b..fb99b43061 100644
  
                  NBTTagCompound data;
 -- 
-2.22.1
+2.23.0
 
diff --git a/Spigot-Server-Patches/0414-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0413-Prevent-consuming-the-wrong-itemstack.patch
index 383afca7f4..e16ac98ea2 100644
--- a/Spigot-Server-Patches/0414-Prevent-consuming-the-wrong-itemstack.patch
+++ b/Spigot-Server-Patches/0413-Prevent-consuming-the-wrong-itemstack.patch
@@ -1,4 +1,4 @@
-From f4f54ad4f65341733ca29e1cc2e469952103dfa4 Mon Sep 17 00:00:00 2001
+From 472240ae22f9124fb83cc5e7a5225deaa178a535 Mon Sep 17 00:00:00 2001
 From: kickash32 <[email protected]>
 Date: Mon, 19 Aug 2019 19:42:35 +0500
 Subject: [PATCH] Prevent consuming the wrong itemstack
diff --git a/Spigot-Server-Patches/0415-only-add-passanger-entities-once-from-spawners.patch b/Spigot-Server-Patches/0414-only-add-passanger-entities-once-from-spawners.patch
index 0d9a705a0a..5e7527e559 100644
--- a/Spigot-Server-Patches/0415-only-add-passanger-entities-once-from-spawners.patch
+++ b/Spigot-Server-Patches/0414-only-add-passanger-entities-once-from-spawners.patch
@@ -1,4 +1,4 @@
-From 585027fd7f1fbd432f33d451948355ae5d4ef31e Mon Sep 17 00:00:00 2001
+From 4eec7762acaae4f806f7994f8df930551948f357 Mon Sep 17 00:00:00 2001
 From: kickash32 <[email protected]>
 Date: Wed, 21 Aug 2019 23:57:32 +0500
 Subject: [PATCH] only add passanger entities once from spawners
diff --git a/Spigot-Server-Patches/0416-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0415-Fix-nether-portal-creation.patch
index da0e5cf071..c1327091da 100644
--- a/Spigot-Server-Patches/0416-Fix-nether-portal-creation.patch
+++ b/Spigot-Server-Patches/0415-Fix-nether-portal-creation.patch
@@ -1,4 +1,4 @@
-From 7c8a99570d2da9d5839045ba2d0e35eb44c74171 Mon Sep 17 00:00:00 2001
+From 0d5ae679315fa7cceb874e2cc7013ed76c81bdd7 Mon Sep 17 00:00:00 2001
 From: Michael Himing <[email protected]>
 Date: Mon, 9 Sep 2019 13:21:17 +1000
 Subject: [PATCH] Fix nether portal creation
@@ -21,5 +21,5 @@ index 88fbfc01b..f66f8b323 100644
          state.setData(data);
          list.put(position, state);
 -- 
-2.23.0.windows.1
+2.23.0
 
diff --git a/Spigot-Server-Patches/0417-Generator-Settings.patch b/Spigot-Server-Patches/0416-Generator-Settings.patch
index f0d9fcbf01..0db1ae3827 100644
--- a/Spigot-Server-Patches/0417-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0416-Generator-Settings.patch
@@ -1,4 +1,4 @@
-From e57e2a690085cbbb4425fe60ebe69071bea3e195 Mon Sep 17 00:00:00 2001
+From 1fe0cdfc1001d7f82bf1bcf6f6655298637da125 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Wed, 2 Mar 2016 02:17:54 -0600
 Subject: [PATCH] Generator Settings
diff --git a/Spigot-Server-Patches/0418-Fix-zero-tick-instant-grow-farms-MC-113809.patch b/Spigot-Server-Patches/0417-Fix-zero-tick-instant-grow-farms-MC-113809.patch
index c70ba01c89..2d2998084d 100644
--- a/Spigot-Server-Patches/0418-Fix-zero-tick-instant-grow-farms-MC-113809.patch
+++ b/Spigot-Server-Patches/0417-Fix-zero-tick-instant-grow-farms-MC-113809.patch
@@ -1,4 +1,4 @@
-From be78eba42d407198576a97b01f0da787a03890dc Mon Sep 17 00:00:00 2001
+From 0c764964d03a2cb1a8c9b2a72c250ec80ab9d3a1 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <[email protected]>
 Date: Sun, 15 Sep 2019 11:32:32 -0500
 Subject: [PATCH] Fix zero-tick instant grow farms MC-113809
diff --git a/Spigot-Server-Patches/0419-Fix-MC-161754.patch b/Spigot-Server-Patches/0418-Fix-MC-161754.patch
index 54c31879b3..827c23efdd 100644
--- a/Spigot-Server-Patches/0419-Fix-MC-161754.patch
+++ b/Spigot-Server-Patches/0418-Fix-MC-161754.patch
@@ -1,4 +1,4 @@
-From bd880ec25fa3db73d596f3307f8b36dc5eb8f701 Mon Sep 17 00:00:00 2001
+From d6a9c5f2f9984186ade4958586b8b8443f4b2492 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Tue, 24 Sep 2019 16:03:00 -0700
 Subject: [PATCH] Fix MC-161754
@@ -22,5 +22,5 @@ index d1b9482d6..ad4e0a45c 100644
  
      @Override
 -- 
-2.22.1
+2.23.0