Updated Upstream ()

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Spigot-Server-Patches/0474-Don-t-toString-block-unless-actually-showing-the-mes.patch

@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 9 May 2020 13:54:25 -0400
-Subject: [PATCH] Don't toString block unless actually showing the message
-
-This is causing MASSIVE performance issues with hoppers and block states
-in general.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 6e9eff2c29528b857cf758e9e45606c8a1c1cc8d..dc0e6e49e9eb5004e53d24304bce095bcef8f4c2 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-@@ -26,7 +26,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
-         // get tile entity from block:
-         CraftWorld world = (CraftWorld) this.getWorld();
-         this.tileEntity = tileEntityClass.cast(world.getHandle().getTileEntity(this.getPosition()));
--        Preconditions.checkState(this.tileEntity != null, "Tile is null, asynchronous access? " + block);
-+        if (tileEntity == null) Preconditions.checkState(false, "Tile is null, asynchronous access? " + block); // Paper - Don't toString block unless actually error'ing...
- 
-         // Paper start
-         this.snapshotDisabled = DISABLE_SNAPSHOT;

Spigot-Server-Patches/0477-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch

@@ -13,7 +13,7 @@ A config is provided if you rather let players use these exploits, and let
 them destroy the worlds End Portals and get on top of the nether easy.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6f0c5a2d33001f59e560ec239c0edbd32de84ed8..ac6b291c103c432fdced603674345096326a9efe 100644
+index 2f9398f7bb90e8ae0a1cb81b162dba28706d408a..5b5edd2aed9cf76535104df65783bfd1d5bb7c85 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -411,4 +411,17 @@ public class PaperConfig {
@@ -157,7 +157,7 @@ index a552cc5bebb1a70db2e679a514769d0ad791ad68..72de544c0782e4daff222a0ca04e5bc8
  
                      this.world.getMethodProfiler().enter("explosion_blocks");
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b479a25044ecf8c1a791729d643cf8dc90193b2b..8d59391befcbc2542a79758d2021ef51df59d815 100644
+index b5127f4b2deaa70b411991d78657f0c9e73d9e43..f2944dcf6b83b530124d53743a3d58b68ecec6f8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -362,6 +362,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

Spigot-Server-Patches/0480-Reduce-allocation-of-Vec3D-by-entity-tracker.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Reduce allocation of Vec3D by entity tracker
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 4965d0fbc123071a2f2f44f559336f7ab9013293..4efc40c01ec12b80bd7cf9d35cf0ea0df973baf7 100644
+index d40d41faae13ee17bbe1c7bd4b64126bcaee5643..3960a975e74ed81c45819fe5e0f01c6c18252982 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -127,8 +127,12 @@ public class EntityTrackerEntry {
@@ -39,7 +39,7 @@ index 4965d0fbc123071a2f2f44f559336f7ab9013293..4efc40c01ec12b80bd7cf9d35cf0ea0d
  
                      if (!flag4 && this.o <= 400 && !this.q && this.r == this.tracker.isOnGround()) {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 56a2d028040bb77bffee72330bc2a19986b45d00..21aba92fe1b5036a4df3add7688019446a1d5fe5 100644
+index c507e71cef1da50e3709e358def6548cc69546e9..1685d6f9f497455636dbcef057db48f9d4039be4 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -2134,9 +2134,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {

Spigot-Server-Patches/0482-Add-option-for-console-having-all-permissions.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option for console having all permissions
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ac6b291c103c432fdced603674345096326a9efe..7e577b889738a5d0b3e5be66d9266cdf01c70b1d 100644
+index 5b5edd2aed9cf76535104df65783bfd1d5bb7c85..456e6363758c41e1d58e178bf839e96aa6df6381 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -424,4 +424,9 @@ public class PaperConfig {

Spigot-Server-Patches/0487-Improve-Chunk-Status-Transition-Speed.patch

@@ -36,7 +36,7 @@ scenario / path:
 Previously would have hopped to SERVER around 12+ times there extra.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index ca9e0208aa35c597a947485f67213ff4b1b1185f..7de56172023e49cd8957e3dd45fa8e731809c16a 100644
+index 371a301f4a295c59ce40fefc6ef07e544414d94b..025ab54dddbf4ef80ce2253f9b6cabcb8e46bfd2 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -58,6 +58,13 @@ public class PlayerChunk {
@@ -54,7 +54,7 @@ index ca9e0208aa35c597a947485f67213ff4b1b1185f..7de56172023e49cd8957e3dd45fa8e73
      // Paper start - no-tick view distance
      public final Chunk getSendingChunk() {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index b6ae589548bdc75052f4986069b3374cb5fd837c..c44eeaae0cff03ae5cfa53b3c0f240ef5e982083 100644
+index 19a31536d40289cba25120d4cc4788e93401ce62..bb515e4c08bccff2a737aed924c5cf59800ecf47 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -741,7 +741,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {

Spigot-Server-Patches/0490-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch

@@ -19,7 +19,7 @@ index 63b112b38a51873cf5769ad8506c3fdb9d52d42c..910d1b3788fa713cadf2c8a56f595282
                  }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 00e88ddd3d41491db2508dba2a544df807703fb0..54de557dd5ff0cae168fc51a5c3cf3d3e4e0d64b 100644
+index 5d299a65417ff17eae3dfe52841c1a27a6d75677..bb73dc2cfca633f85aa0aa1c988d3cdd86be8e4e 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -307,8 +307,8 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0492-Optimize-Light-Engine.patch

@@ -1400,7 +1400,7 @@ index b7af235dc2841dc9c8296805624f6ee763b86dfb..faf4745d368993ccdf0c017937efc5be
          this.a.a(t0);
          this.f();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 54de557dd5ff0cae168fc51a5c3cf3d3e4e0d64b..1f1ea5c64f325f54a56a3b060706db13c18aca61 100644
+index bb73dc2cfca633f85aa0aa1c988d3cdd86be8e4e..61eeba3c25fecfdebfeb546b7e18ff4464eedfc2 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -714,6 +714,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0493-Delay-Chunk-Unloads-based-on-Player-Movement.patch

@@ -35,7 +35,7 @@ index 6463d3e4837d032a35654a035f42b8a805e0e286..1655bca0502e7b871de4addaa163536d
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
-index 09fec533d7feebb90e989007dd19c952823550ba..3c7b225edbe23dc1959002293a6f8b816287b5a8 100644
+index d0bdffadefa6ed67bd30d833891256cc39a8f7f0..76f9bb728def91744910d0b680b73e753f1a2b26 100644
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
 @@ -176,6 +176,27 @@ public abstract class ChunkMapDistance {

Spigot-Server-Patches/0496-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch

@@ -7,7 +7,7 @@ Subject: [PATCH] Fix CraftScheduler#runTaskTimerAsynchronously(Plugin,
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 7532bbd82559763cfaf5433a07914b5fb906122c..1bc65ae63673b1de3aa6e0c49bf95dadd7d7b355 100644
+index ca90237a53c9a026919d28adaedf483ca3c7c2a8..13e461ffb2ee2e7d0440c0f60809ea99629b843c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -184,7 +184,7 @@ public class CraftScheduler implements BukkitScheduler {

Spigot-Server-Patches/0497-Fix-piston-physics-inconsistency-MC-188840.patch

@@ -32,7 +32,7 @@ This patch fixes https://bugs.mojang.com/browse/MC-188840
 This patch also fixes rail duping and carpet duping.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7e577b889738a5d0b3e5be66d9266cdf01c70b1d..fc03df234fc641f72b4d4a79535860300006ff50 100644
+index 456e6363758c41e1d58e178bf839e96aa6df6381..fd3b4a01c84da110d41b7224ebb38ae78b389f79 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -429,4 +429,10 @@ public class PaperConfig {

Spigot-Server-Patches/0499-Prevent-position-desync-in-playerconnection-causing-.patch

@@ -14,7 +14,7 @@ behaviour, we need to move all of this dangerous logic outside
 of the move call and into an appropriate place in the tick method.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e76c01a33bfcee1a9d312247b8d08026055204c8..45379bf4903ca8044145504207acd59c221b7f26 100644
+index 257c3489f9add056966cdb8eaaa49fa438369bb6..d47ad31ac47565298bc3e5614a78f7f42d5f4c11 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1176,6 +1176,11 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0503-Add-and-implement-PlayerRecipeBookClickEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 45379bf4903ca8044145504207acd59c221b7f26..c9b834c38f8d7b21d0a7a0d04762f66d41b0c39d 100644
+index d47ad31ac47565298bc3e5614a78f7f42d5f4c11..9e8d28146658782c7a89dca7b12c68ea70e132b2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2612,9 +2612,15 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0506-Add-permission-for-command-blocks.patch

@@ -31,7 +31,7 @@ index 7e13b1cf6d92c3e0f2dab1ba1d42bd4f250e256c..3820acd65f3cd488dba964e6d9c45885
          } else {
              if (entityhuman.getWorld().isClientSide) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c33707d55c80341eaacd6c6a7526444ee5b2cc0a..b1156e31ec45b7515734a440f07331cf731c3ab6 100644
+index 9e8d28146658782c7a89dca7b12c68ea70e132b2..2d2fd9a45bcfd2b1da8b7dd109eb50257ab394c9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -648,7 +648,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0507-Ensure-Entity-AABB-s-are-never-invalid.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 48373bf947fc19a34caa34daeed980cc433bc600..896832d4742969e6cc2f58bbba281b4a60ef28b0 100644
+index feeb792e3357c14662a2a2dc5c294befd4bdc7c3..23e8de6d059a4976646184bc3a141d38291fadd1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -389,7 +389,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0508-Optimize-WorldBorder-collision-checks-and-air.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize WorldBorder collision checks and air
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c9f5f341371e1ccc7c9a71bb357862424d801d8a..422b82f15c323f504458a1fdcd5cf7018ab53468 100644
+index 23e8de6d059a4976646184bc3a141d38291fadd1..ad5139428e8cc10ed702dce3fa9c091c22eafa15 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -818,7 +818,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0520-Add-entity-liquid-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity liquid API
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ded88464d102679423ac69d8a6c3cf4ba6fc516f..bf0ef3998ff5dd71d3d6489184ece7fdce8afdd5 100644
+index ad5139428e8cc10ed702dce3fa9c091c22eafa15..83a469447e39b801442769fcb5979e987e2adae9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1075,12 +1075,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0521-Update-itemstack-legacy-name-and-lore.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Update itemstack legacy name and lore
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 8c82f80bb21611b54a35e61c04f5ba3ee9efbd7d..ace50805bfebbf4c3485ba1de334d975830a7d3c 100644
+index b6f771ed5032cd18b1bcc086a937f66996a26057..a3d8d8ec0e99435a58ab93a7b1f90d16be2a2289 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -83,6 +83,44 @@ public final class ItemStack {

Spigot-Server-Patches/0526-Optimize-NetworkManager-Exception-Handling.patch

@@ -44,7 +44,7 @@ index cdaa8be90d16b0e9e2f92a3e2ed120b856feab54..2aaa8770edfd8acc6861c23176e40586
          for (int i = 0; i < abyte.length; ++i) {
              if (!bytebuf.isReadable()) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
-index eb3269e0ea3ce33d08e9eee3bca7cf434921e991..7ea293f38dedd6066601d94adbe175a31c502e1f 100644
+index 9c810b5aa21ca714ccf355d5648b7612f99b6884..8c7080777b370f97e1291dfedde5b419290f39cc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -22,6 +22,21 @@ public class PlayerConnectionUtils {

Spigot-Server-Patches/0531-Move-range-check-for-block-placing-up.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9b54d690e09f719a18ba321a0c927bb31c71bf01..f19fd40cdc1e758ebefb85201358e314428bd8c6 100644
+index d9911b214e83e4046b4ad82be904600a00955384..601a6fdf52ac0002f130ea27d4dd3e6f64acc381 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1512,15 +1512,19 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0533-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5824 Bukkit world-container is not used
 
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 80a95441ec2b8394b74818ab74de070ba1ce2754..9b2fba00b574087575ba70c82613fbcd343de826 100644
+index e79ed0b5702688aaa5a86dc5a511c32685c883d9..a2cfd23e537de64ca8af26853fdede59af64108d 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -92,11 +92,20 @@ public class Main {

Spigot-Server-Patches/0534-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5885 Unable to disable advancements
 
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 9b2fba00b574087575ba70c82613fbcd343de826..ae48df4b9b78bc3a687166fdaa7b8a60bd13ec35 100644
+index a2cfd23e537de64ca8af26853fdede59af64108d..1c6dbd29c8414b3e33aedcc50bee5b5d9ce134d1 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -92,6 +92,7 @@ public class Main {

Spigot-Server-Patches/0536-Add-missing-strikeLighting-call-to-World-spigot-stri.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing strikeLighting call to
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 24546615dcd9b4f5fa140137ff59d8efe9e3b52f..e50a16991cf3f5df04c9410b211a13c33bbe91d1 100644
+index 10697f8b5208a72bf3d7248c5abd73ddd10420cd..f3aab5be1722651a27bb48a33618650b807d4e07 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2609,6 +2609,7 @@ public class CraftWorld implements World {

Spigot-Server-Patches/0541-Don-t-mark-null-chunk-sections-for-block-updates.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Don't mark null chunk sections for block updates
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 8146d88a90a758760e383985170d580372577615..c69b5a2c7b8061a65b2d5bb7ceb3ffe39dc36b8c 100644
+index acb07a2a7a7606470aa938ffc8f6a54fd7b9f5f9..014c0249b22eb4703d2d6b430afb402689a54e2a 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -420,6 +420,7 @@ public class PlayerChunk {

Spigot-Server-Patches/0553-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 1f1ea5c64f325f54a56a3b060706db13c18aca61..6286ef81cb5ef95c4d5e0c384e73fbece0a096f6 100644
+index 61eeba3c25fecfdebfeb546b7e18ff4464eedfc2..705ce638416e98166a5c659f425be90af1a9a59b 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1864,12 +1864,14 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -24,7 +24,7 @@ index 1f1ea5c64f325f54a56a3b060706db13c18aca61..6286ef81cb5ef95c4d5e0c384e73fbec
              // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add
              this.removeTicketsForSpawn(this.paperConfig.keepLoadedRange, prevSpawn);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4ab3db10e26dc9739c5afcfc423d1c68a2c4d1c9..3e6924a05bd85563d75f51e4e275896c77d7ad42 100644
+index f3aab5be1722651a27bb48a33618650b807d4e07..257d3d9fe97122b5d123509d54916e0c1b16788d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -388,11 +388,13 @@ public class CraftWorld implements World {

Spigot-Server-Patches/0554-Add-moon-phase-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add moon phase API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3e6924a05bd85563d75f51e4e275896c77d7ad42..299f57ca2a65887a0d7e7c584fc1bd5c783b0db2 100644
+index 257d3d9fe97122b5d123509d54916e0c1b16788d..1162bf553ff6e5c5faf688b080a202dc55650ced 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -327,6 +327,11 @@ public class CraftWorld implements World {

Spigot-Server-Patches/0555-Prevent-headless-pistons-from-being-created.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent headless pistons from being created
 Prevent headless pistons from being created by explosions or tree/mushroom growth.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d86474a1a97597c14ea8a28444e2a5d82fcda2a7..e0422471776f34b8e3c753d855aa06f00cc049ec 100644
+index deb77934dcba8c9209c942a6521dd8486cb5a48d..35a6b9b6d0eed316cafced70fe98b7477450c435 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -436,6 +436,12 @@ public class PaperConfig {

Spigot-Server-Patches/0558-Add-zombie-targets-turtle-egg-config.patch

@@ -19,7 +19,7 @@ index 978062774c1db286bfb9b0ffdef19d880b1f249b..36ecdfce84141ac731b827e469ac842f
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index f390abf65d648e1e0697e2d802f3195a0241116e..e3606722cb1b3f6a11d34e1cdef7210280dba677 100644
+index 360f14a3128f9a4c31fadb5a6f245d15845c8ae0..59bfb9c269aa95d66e7b9f107f6798f7f86fd245 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -46,7 +46,7 @@ public class EntityZombie extends EntityMonster {

Spigot-Server-Patches/0559-Buffer-joins-to-world.patch

@@ -8,7 +8,7 @@ the world per tick, this attempts to reduce the impact that join floods
 has on the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index e0422471776f34b8e3c753d855aa06f00cc049ec..2e9c3b45052ad641bee091ee28cc57b93cd19ffe 100644
+index 35a6b9b6d0eed316cafced70fe98b7477450c435..110cee7228b17a2378523883a1a83cc97da7608d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -452,4 +452,9 @@ public class PaperConfig {

Spigot-Server-Patches/0561-Fix-hex-colors-not-working-in-some-kick-messages.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix hex colors not working in some kick messages
 
 
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 5e1747dc176ef855829a38605ec85c8494fb0d21..1d60def8fa7041b3383c287153cbb9c6cec3d0f9 100644
+index 471826ee4b32fe73d3c39755005e3287f9673c3c..79f726ef43e70b8882890007146df199824d14e3 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -35,7 +35,7 @@ public class HandshakeListener implements PacketHandshakingInListener {

Spigot-Server-Patches/0562-PortalCreateEvent-needs-to-know-its-entity.patch

@@ -39,7 +39,7 @@ index e5d75a8a93ffe7bc3747b48210eea6189a956d54..0e6ce21db67447d0eb84eb1633653dec
      }
  
 diff --git a/src/main/java/net/minecraft/server/BlockFireAbstract.java b/src/main/java/net/minecraft/server/BlockFireAbstract.java
-index fcd989ade672a96d0905590484941ce4508dae4d..172e4b3eeecc3808a335b80bb44bc6be3d8dd33d 100644
+index 7e95b150c4c87445ec221f1b9b7d2e7f7899688b..691346f69e5afd2eb96411c485ba8071d491d12a 100644
 --- a/src/main/java/net/minecraft/server/BlockFireAbstract.java
 +++ b/src/main/java/net/minecraft/server/BlockFireAbstract.java
 @@ -52,14 +52,17 @@ public abstract class BlockFireAbstract extends Block {
@@ -88,7 +88,7 @@ index b7635ab1625c5b2540e44aafc2b908749820f7e2..6ef81aeb4c63bc6c23163796dbd97760
  
          if (event.isCancelled()) {
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index ace50805bfebbf4c3485ba1de334d975830a7d3c..3adb29f004d2fee36f3ee9b21ee5417e84b64837 100644
+index a3d8d8ec0e99435a58ab93a7b1f90d16be2a2289..afa1dc693bc2e2e68294a1d3dec1c078ea95b286 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -313,7 +313,7 @@ public final class ItemStack {

Spigot-Server-Patches/0565-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch

@@ -74,7 +74,7 @@ index f787238575ed7ac9108a2fd9782af55056219767..3524b677525bf2bb529b797fe1f258ef
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 22d41555ddc8c79609bea9f8dc510ab8a02e7872..1718735d00a0316b5b7a61adaf22f7118daaff08 100644
+index 324afd2a5e50a3b1fd9de926f6da8836b00e173b..865c1e4cf18b25ecf2ba8d592d9ca40f631e2215 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -45,6 +45,7 @@ import org.bukkit.Registry;

Spigot-Server-Patches/0567-Cache-block-data-strings.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Cache block data strings
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 84b304b4998f682688be26b9402da8eed8c265a8..3d4ecddcbfedb54d26888ff464bd0e6c7eec82e3 100644
+index 69fcfff3f21168f334fd526cb65e63e086d32a70..1c59c40693359224004ed1ae19fa1d32a8053970 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1831,6 +1831,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

Spigot-Server-Patches/0568-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch

@@ -9,7 +9,7 @@ as this is how Vanilla teleports entities.
 Cancel any pending motion when teleported.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6aeea48d4cf4732f6a5a5dba12af873c2aee493b..fa0256a99c833e6035b8d3e873a93af2b674ef52 100644
+index 83a469447e39b801442769fcb5979e987e2adae9..e65cb9c72e46d50b871d1c7b5789a1855622d934 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -54,6 +54,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -35,7 +35,7 @@ index 6aeea48d4cf4732f6a5a5dba12af873c2aee493b..fa0256a99c833e6035b8d3e873a93af2
          this.yaw = f;
          this.pitch = f1;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 444355e81bd7f5d07e3ef5f4b9d91d1bf11428ef..cef65c7bde4b759014312c6bcc3b0ac6c4b0c462 100644
+index f1e3c764fc8d5b6acb2ae94276e31fe37af817b6..5af38d36f64020d1df492ad57fafd2baf867536a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -542,7 +542,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0571-Extend-block-drop-capture-to-capture-all-items-added.patch

@@ -25,7 +25,7 @@ index 4b564d36135e9dbdbb57a95791f89aefd180457b..485b609bb5387b0f8a46c1201177cdc6
                  // Drop event experience
                  if (flag && event != null) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 6286ef81cb5ef95c4d5e0c384e73fbece0a096f6..5b0b6edfa790918e56399ff6c83f3feb6e5aca49 100644
+index 705ce638416e98166a5c659f425be90af1a9a59b..91d759fee68e8b285f912406fb338750c286f6a0 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1177,6 +1177,13 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0572-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Don't mark dirty in invalid locations (SPIGOT-6086)
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index c69b5a2c7b8061a65b2d5bb7ceb3ffe39dc36b8c..11a67ca18f566bfc214659e7fb454ea2b4d8a7ad 100644
+index 014c0249b22eb4703d2d6b430afb402689a54e2a..42b12ad5ba68bdf8f76704ddd970715770183de0 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -359,6 +359,7 @@ public class PlayerChunk {