Drop 0394-Fixed-MC-156852.patch (Fixes #2913)

Spigot-Server-Patches/0394-Asynchronous-chunk-IO-and-loading.patch

@@ -1,4 +1,4 @@
-From 95c7fe3e2ccab2ab2cc0c503508a1c43c136e1e7 Mon Sep 17 00:00:00 2001
+From 8a4c412b9a5811abc5ecb61f12d2eb4bc3da7b1e Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 13 Jul 2019 09:23:10 -0700
 Subject: [PATCH] Asynchronous chunk IO and loading
@@ -4108,5 +4108,5 @@ index 07936eeba..5bdcdcf9e 100644
                  log.log( Level.SEVERE, "------------------------------" );
                  //
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0394-Fixed-MC-156852.patch

@@ -1,29 +0,0 @@
-From 91a4d1f49eaf71a0e8695ae4b1d4d34726a278e2 Mon Sep 17 00:00:00 2001
-From: TheGreatKetchup <TheGreatKetchup@users.noreply.github.com>
-Date: Thu, 1 Aug 2019 21:24:30 -0400
-Subject: [PATCH] Fixed MC-156852
-
-This corrects the 1.14.4 of "phantom" blocks that the client thinks are
-deleted but the server does not.
-
-It uses the same solution that fixed the glitch that caused the same
-issue in 1.8-1.12.
-
-Originally solved by Gnembon on MC-5694 at bugs.mojang.com
-
-diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index ce4340a47..8f7b08a6d 100644
---- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
-+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-@@ -223,7 +223,7 @@ public class PlayerInteractManager {
-                     int j = (int) (f * 10.0F);
- 
-                     this.world.a(this.player.getId(), blockposition, j);
--                    this.player.playerConnection.sendPacket(new PacketPlayOutBlockBreak(blockposition, this.world.getType(blockposition), packetplayinblockdig_enumplayerdigtype, true, "actual start of destroying"));
-+                    this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition)); // Paper - fixes MC-156852
-                     this.l = j;
-                 }
-             } else if (packetplayinblockdig_enumplayerdigtype == PacketPlayInBlockDig.EnumPlayerDigType.STOP_DESTROY_BLOCK) {
--- 
-2.25.0.windows.1
-

Spigot-Server-Patches/0395-Use-getChunkIfLoadedImmediately-in-places.patch

@@ -1,4 +1,4 @@
-From 0a16c31383daff812445a168e9316b3b7758e80e Mon Sep 17 00:00:00 2001
+From a39d46b1f933c5cf6a96525be0f31f1714b5205f 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,7 +8,7 @@ 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 a92f251ca5..2917e1bd42 100644
+index a92f251ca..2917e1bd4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -204,7 +204,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -21,7 +21,7 @@ index a92f251ca5..2917e1bd42 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8c54022e07..f6fbba36f4 100644
+index 8c54022e0..f6fbba36f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -989,7 +989,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -34,7 +34,7 @@ index 8c54022e07..f6fbba36f4 100644
                                  return;
                              }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bcf326c859..9f12d765bd 100644
+index 9d604a758..bfbbfb1ba 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -114,8 +114,16 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -73,7 +73,7 @@ index bcf326c859..9f12d765bd 100644
              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 f86404f83a..92601c581c 100644
+index f86404f83..92601c581 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -143,9 +143,10 @@ public class ActivationRange

Spigot-Server-Patches/0396-Reduce-sync-loads.patch

@@ -1,4 +1,4 @@
-From c707259e8fb640d0bd12e96335b78eb621b09323 Mon Sep 17 00:00:00 2001
+From 95d51be5952ba6c58778cc000dcfecdf2762d7e8 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
@@ -328,5 +328,5 @@ index 5eb52817f..6d362316f 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.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0397-Implement-alternative-item-despawn-rate.patch

@@ -1,4 +1,4 @@
-From f9cc1034bd1c69afdf1201db96f1b57d35affb8c Mon Sep 17 00:00:00 2001
+From 57355251558e0c93d1013da0a4daf31c0749dbdc 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
@@ -128,5 +128,5 @@ index a0d1e7fd2..e61af3f5e 100644
      public Packet<?> L() {
          return new PacketPlayOutSpawnEntity(this);
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0398-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch

@@ -1,4 +1,4 @@
-From 69a3146d91af39ed115c6017775fe608fa12a6c0 Mon Sep 17 00:00:00 2001
+From ccc77a6fcce7424b8fe23ec255b5f9f2a3f472de 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,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 4c74a85e0..b3d23de1b 100644
+index 6d362316f..9055df2ca 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -807,12 +807,13 @@ public class WorldServer extends World {
@@ -45,5 +45,5 @@ index 4c74a85e0..b3d23de1b 100644
                  WorldServer.LOGGER.warn("Unable to find spawn biome");
              }
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0399-Fix-MC-158900.patch

@@ -1,4 +1,4 @@
-From 0cb106700f315e3cf1e6e2c6f519611dde76d3d3 Mon Sep 17 00:00:00 2001
+From 01c349f67f42dfe0eae6e4df65fbfd8ecdd68240 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
@@ -24,5 +24,5 @@ index 68e089a4b..f702619aa 100644
              chatmessage = new ChatMessage("multiplayer.disconnect.banned.reason", new Object[]{gameprofilebanentry.getReason()});
              if (gameprofilebanentry.getExpires() != null) {
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0400-implement-optional-per-player-mob-spawns.patch

@@ -1,4 +1,4 @@
-From e8bdd07c7eedbdc075d9e637f6206ae148e329bd Mon Sep 17 00:00:00 2001
+From b1cf779b03f6b30e934f3c01b5b304cdde97c96e 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
@@ -800,5 +800,5 @@ index 9055df2ca..5ec0acc30 100644
  
      @Override
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0401-Prevent-consuming-the-wrong-itemstack.patch

@@ -1,4 +1,4 @@
-From 0e126d36e43b6d2ee76d3b32cb8c0e3e61726a2a Mon Sep 17 00:00:00 2001
+From 3d2cfefe958cd9c58530a13d0fb3b1268b34fe72 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
@@ -44,5 +44,5 @@ index af79b6e37..b098cd6d7 100644
                  }
                  // Paper end
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0402-only-add-passanger-entities-once-from-spawners.patch

@@ -1,4 +1,4 @@
-From 5c76b806f7dfdc6aa605e9c555881598656d55b6 Mon Sep 17 00:00:00 2001
+From d5cd7b4f8513250a13290b1367076c4cd71dfbcf 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
@@ -18,5 +18,5 @@ index b179893a1..b96f6461d 100644
  
              while (iterator.hasNext()) {
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0403-Fix-nether-portal-creation.patch

@@ -1,4 +1,4 @@
-From 46a316fdf003cd8d6ace9a722facd9c0a7d6ccde Mon Sep 17 00:00:00 2001
+From 93d110715eed5843d746a1412dc9033216cf172f 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
@@ -21,5 +21,5 @@ index 60330f753..c22dbbfbe 100644
          state.setData(data);
          list.put(position, state);
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0404-Generator-Settings.patch

@@ -1,4 +1,4 @@
-From f9873a8b7b662603099b4767da5e7b9743b3b61d Mon Sep 17 00:00:00 2001
+From 8512e2be1a6eddf20366466249c26b6505199dff 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
@@ -52,5 +52,5 @@ index af81a8414..2268fbdd8 100644
                      }
                  }
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0405-Fix-zero-tick-instant-grow-farms-MC-113809.patch

@@ -1,4 +1,4 @@
-From c8b92f4b4cd63da65a9dac056dc348c1ce9a2df5 Mon Sep 17 00:00:00 2001
+From dd5b17a71c994c9242a43575d4393b258940c2b4 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
@@ -81,7 +81,7 @@ 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 909af91ca..32512e5cc 100644
+index 5ec0acc30..569ae0b9e 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -590,7 +590,9 @@ public class WorldServer extends World {
@@ -95,5 +95,5 @@ index 909af91ca..32512e5cc 100644
  
                          Fluid fluid = iblockdata.getFluid();
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0406-Fix-MC-161754.patch

@@ -1,4 +1,4 @@
-From 64838870c3ed929c53914c8b867cb3d73eade9ef Mon Sep 17 00:00:00 2001
+From 1448afa6b67445f2ccfd8b0cd4e4b9b747e1e342 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
@@ -22,5 +22,5 @@ index c95ce0124..18e1ae7f0 100644
  
      @Override
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0407-Performance-improvement-for-Chunk.getEntities.patch

@@ -1,4 +1,4 @@
-From e73a4f5457041d81d437d6f98705251df18b7167 Mon Sep 17 00:00:00 2001
+From e9c8733e3b5f64257ec416a75cc83c5f028bc1e6 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
@@ -34,5 +34,5 @@ index 91f2066b1..9cff8b88b 100644
  
          return entities;
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0408-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch

@@ -1,4 +1,4 @@
-From 685a505a55a6d57d1c53d627ccf4559214af98df Mon Sep 17 00:00:00 2001
+From 83bc7be93262e6017c5b134f9b1b66ff3f589915 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 9fe9098089..7654519c9e 100644
+index 9fe909808..7654519c9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1826,7 +1826,12 @@ public class CraftWorld implements World {

Spigot-Server-Patches/0409-Expose-the-internal-current-tick.patch

@@ -1,4 +1,4 @@
-From d5fc5250c5404103b92b76c9fee15fdcdf1c782c Mon Sep 17 00:00:00 2001
+From 25cb1c43251debb7719af90fee4c6c7684978816 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
@@ -20,5 +20,5 @@ index 9a5ca755b..ee5c57ca2 100644
      // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0410-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch

@@ -1,11 +1,11 @@
-From 262186e4bfad4cce5fc6ae9ec41be8f1e9d88e5a Mon Sep 17 00:00:00 2001
+From 8b2fdab63c344ea88957b7c3ddd6add574f1ac31 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 22606d894e..0b35a4b143 100644
+index 22606d894..0b35a4b14 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -980,6 +980,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -18,7 +18,7 @@ index 22606d894e..0b35a4b143 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 f702619aa2..7b79ee4fe5 100644
+index f702619aa..7b79ee4fe 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 {
@@ -31,5 +31,5 @@ index f702619aa2..7b79ee4fe5 100644
          entityplayer.triggerDimensionAdvancements(((CraftWorld) fromWorld).getHandle());
  
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0411-Add-option-to-disable-pillager-patrols.patch

@@ -1,4 +1,4 @@
-From 69ee23487c8d7dc08b9119e2114624d4e4e4985a Mon Sep 17 00:00:00 2001
+From 51b9651ad6a9905786add533bdd54e3c9b314134 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
@@ -31,5 +31,5 @@ index 33488b37e..a0f582807 100644
              return 0;
          } else if (!worldserver.getGameRules().getBoolean(GameRules.DO_PATROL_SPAWNING)) {
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0412-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch

@@ -1,4 +1,4 @@
-From a01ad1a56d67a680d5ad8f3fa3edbfbf104d00a0 Mon Sep 17 00:00:00 2001
+From 67f7f66f2c172669ff4c7ee609fb998c67ebedfa 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
@@ -34,5 +34,5 @@ index f6fbba36f..a1ce2d2e0 100644
              }
              // CraftBukkit end
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0413-PlayerLaunchProjectileEvent.patch

@@ -1,11 +1,11 @@
-From 21011ca9f386aea65f2e9c521b391745bc9e9974 Mon Sep 17 00:00:00 2001
+From 59aa9a9b449b105136155c63953779acaec6d212 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 5cab47a282..886babdcda 100644
+index 5cab47a28..886babdcd 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 5cab47a282..886babdcda 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 6fccd70a03..16f1b734e0 100644
+index 6fccd70a0..16f1b734e 100644
 --- a/src/main/java/net/minecraft/server/ItemEgg.java
 +++ b/src/main/java/net/minecraft/server/ItemEgg.java
 @@ -16,21 +16,35 @@ public class ItemEgg extends Item {
@@ -61,7 +61,7 @@ index 6fccd70a03..16f1b734e0 100644
          return InteractionResultWrapper.success(itemstack);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemEnderPearl.java b/src/main/java/net/minecraft/server/ItemEnderPearl.java
-index cab869e8e9..b57e9f7e72 100644
+index cab869e8e..b57e9f7e7 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 {
@@ -113,7 +113,7 @@ index cab869e8e9..b57e9f7e72 100644
          return InteractionResultWrapper.success(itemstack);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemExpBottle.java b/src/main/java/net/minecraft/server/ItemExpBottle.java
-index 071688b3ab..1d575af526 100644
+index 071688b3a..1d575af52 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 {
@@ -158,7 +158,7 @@ index 071688b3ab..1d575af526 100644
          return InteractionResultWrapper.success(itemstack);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemLingeringPotion.java b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
-index c19b678cfb..7672e31fc0 100644
+index c19b678cf..7672e31fc 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 {
@@ -176,7 +176,7 @@ index c19b678cfb..7672e31fc0 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/ItemPotionThrowable.java b/src/main/java/net/minecraft/server/ItemPotionThrowable.java
-index 5d1f118c51..d1beab1ab7 100644
+index 5d1f118c5..d1beab1ab 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 {
@@ -213,7 +213,7 @@ index 5d1f118c51..d1beab1ab7 100644
          return InteractionResultWrapper.success(itemstack);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemSnowball.java b/src/main/java/net/minecraft/server/ItemSnowball.java
-index 56ec508959..e6044e654b 100644
+index 56ec50895..e6044e654 100644
 --- a/src/main/java/net/minecraft/server/ItemSnowball.java
 +++ b/src/main/java/net/minecraft/server/ItemSnowball.java
 @@ -17,19 +17,27 @@ public class ItemSnowball extends Item {
@@ -251,7 +251,7 @@ index 56ec508959..e6044e654b 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 18bd846cee..e71e933fff 100644
+index 18bd846ce..e71e933ff 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 {

Spigot-Server-Patches/0414-Add-CraftMagicNumbers.isSupportedApiVersion.patch

@@ -1,4 +1,4 @@
-From f7e36c12bf727ec05cf8c0d160da894024f7176d Mon Sep 17 00:00:00 2001
+From 6c69133e1ead914f0314c1fff50bba565d3cc1b6 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()

Spigot-Server-Patches/0415-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch

@@ -1,4 +1,4 @@
-From 7b77187774c1c4be0bb7f64522e3594f4934846f Mon Sep 17 00:00:00 2001
+From b5a58bc1b7288a7fb29b74839a68ceefc0b8d28c Mon Sep 17 00:00:00 2001
 From: Callahan <mr.callahhh@gmail.com>
 Date: Mon, 13 Jan 2020 23:47:28 -0600
 Subject: [PATCH] Prevent sync chunk loads when villagers try to find beds
@@ -19,5 +19,5 @@ index fa575dde1..dfe0f6650 100644
                      return globalpos.getBlockPosition().a((IPosition) entityliving.getPositionVector(), 2.0D) && iblockdata.getBlock().a(TagsBlock.BEDS) && !(Boolean) iblockdata.get(BlockBed.OCCUPIED);
                  }
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0416-Fix-spawn-radius-being-treated-as-0.patch

@@ -1,11 +1,11 @@
-From 4eb744dc8be173a1d78c9729dfea41151b4cda46 Mon Sep 17 00:00:00 2001
+From c40f96693475ff2eef780c0d10e9a8c0ef6d86fd 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 0b35a4b143..4ca28c8b64 100644
+index 0b35a4b14..4ca28c8b6 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -127,7 +127,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -18,5 +18,5 @@ index 0b35a4b143..4ca28c8b64 100644
              int j = MathHelper.floor(worldserver.getWorldBorder().b((double) blockposition.getX(), (double) blockposition.getZ()));
  
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0417-MC-145656-Fix-Follow-Range-Initial-Target.patch

@@ -1,4 +1,4 @@
-From e3376b78dc9f247bd0c164003a5c5e6e5af271ec Mon Sep 17 00:00:00 2001
+From 2c8183b4b216a2cffce18c4513b816d1031e642a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 18 Dec 2019 22:21:35 -0600
 Subject: [PATCH] MC-145656 Fix Follow Range Initial Target
@@ -63,5 +63,5 @@ index c76a43837..e35ec2db0 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0418-Optimize-Hoppers.patch

@@ -1,4 +1,4 @@
-From 676ced8c74cd7909a1c161c77b8a93d1dd21b8e5 Mon Sep 17 00:00:00 2001
+From 3ac137952a2bd84c2aa47dda56355346ff5e2ea1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Optimize Hoppers
@@ -29,7 +29,7 @@ index f8d8cb865..3b8488d3f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 1be4cd163..182633bca 100644
+index d953cdef1..d6e43313b 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -482,11 +482,12 @@ public final class ItemStack {
@@ -307,5 +307,5 @@ index 907d088c8..4afd33a49 100644
                  flag = true;
              } else if (a(itemstack1, itemstack)) {
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0419-PlayerDeathEvent-shouldDropExperience.patch

@@ -1,11 +1,11 @@
-From 9e075ab344d25cb7cec6f3afc5a76cc2970280d1 Mon Sep 17 00:00:00 2001
+From 2056a69d1bdb6b08ae97ac5f1485dc7c795acbdd Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 24 Dec 2019 00:35:42 +0000
 Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4ca28c8b64..15230a834c 100644
+index 4ca28c8b6..15230a834 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -643,7 +643,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -18,5 +18,5 @@ index 4ca28c8b64..15230a834c 100644
          if (!event.getKeepInventory()) {
              // Paper start - replace logic
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0420-Prevent-bees-loading-chunks-checking-hive-position.patch

@@ -1,4 +1,4 @@
-From e23ef0c34b897a117281b61b3ca36a75e213c8da Mon Sep 17 00:00:00 2001
+From bac0c036cb48667eb3238938a2878bf733b0e0f1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 5 Jan 2020 17:24:34 -0600
 Subject: [PATCH] Prevent bees loading chunks checking hive position
@@ -17,5 +17,5 @@ index d1d7db062..f67d66b9a 100644
  
              return tileentity != null && tileentity.getTileType() == TileEntityTypes.BEEHIVE;
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0421-Don-t-load-Chunks-from-Hoppers-and-other-things.patch

@@ -1,4 +1,4 @@
-From bcd462bd1b2e7fd07d780470fb9b8ea58a34b56c Mon Sep 17 00:00:00 2001
+From 5abb62d4dfe70f4d5d9d76a8bf6bc0958198ef20 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 20:28:12 -0400
 Subject: [PATCH] Don't load Chunks from Hoppers and other things
@@ -32,5 +32,5 @@ index 3cb6e6089..7a16a3e0e 100644
                      DoubleBlockFinder.BlockType doubleblockfinder_blocktype1 = (DoubleBlockFinder.BlockType) function.apply(iblockdata1);
  
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0422-Guard-against-serializing-mismatching-chunk-coordina.patch

@@ -1,4 +1,4 @@
-From 8e8e3b451fd7a632f61a0cc503feacb904487da4 Mon Sep 17 00:00:00 2001
+From e0a4155558a6c810a7357f0eb029d9e489080bee Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 27 Dec 2019 09:42:26 -0800
 Subject: [PATCH] Guard against serializing mismatching chunk coordinate
@@ -53,5 +53,5 @@ index 134c76065..25c8b131f 100644
          if (this.c != null) {
              synchronized (this.persistentDataLock) { // Paper - Async chunk loading
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0423-Optimise-IEntityAccess-getPlayerByUUID.patch

@@ -1,4 +1,4 @@
-From 452b0cd832ff24ce65a8d5bab77db2eb4a3665ab Mon Sep 17 00:00:00 2001
+From 5a87ceeb957d4c5665bfe1b20fab70c43e24a25d Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 11 Jan 2020 21:50:56 -0800
 Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID
@@ -23,7 +23,7 @@ index d5c284cdd..4157e50e4 100644
              EntityHuman entityhuman = (EntityHuman) this.getPlayers().get(i);
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 32512e5cc..0b3f6b8ba 100644
+index 569ae0b9e..6ec394da5 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -82,6 +82,15 @@ public class WorldServer extends World {
@@ -43,5 +43,5 @@ index 32512e5cc..0b3f6b8ba 100644
      public final com.destroystokyo.paper.io.PaperFileIOThread.ChunkDataController poiDataController = new com.destroystokyo.paper.io.PaperFileIOThread.ChunkDataController() {
          @Override
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0424-Fix-items-not-falling-correctly.patch

@@ -1,4 +1,4 @@
-From a8e7ed3eb8a42ddcaac5ea98204787b3425e35f2 Mon Sep 17 00:00:00 2001
+From 69bcbbedd0ba97943fb186169d61af8455427799 Mon Sep 17 00:00:00 2001
 From: AJMFactsheets <AJMFactsheets@gmail.com>
 Date: Fri, 17 Jan 2020 17:17:54 -0600
 Subject: [PATCH] Fix items not falling correctly
@@ -28,5 +28,5 @@ index e61af3f5e..d15a9fcfb 100644
                  float f = 0.98F;
  
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0425-Optimize-call-to-getFluid-for-explosions.patch

@@ -1,11 +1,11 @@
-From 91e9bdcaf03ebe68435195d6565bc721fb16f3fe Mon Sep 17 00:00:00 2001
+From 4fbc26ec66035fd45ddac8f746b15dd20c0a6a0b Mon Sep 17 00:00:00 2001
 From: BrodyBeckwith <brody@beckwith.dev>
 Date: Tue, 14 Jan 2020 17:49:03 -0500
 Subject: [PATCH] Optimize call to getFluid for explosions
 
 
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 8762a566d..3fd4c12b1 100644
+index d99d2defe..a353f3d5f 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -117,7 +117,7 @@ public class Explosion {
@@ -18,5 +18,5 @@ index 8762a566d..3fd4c12b1 100644
                              if (!iblockdata.isAir() || !fluid.isEmpty()) {
                                  float f2 = Math.max(iblockdata.getBlock().getDurability(), fluid.k());
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0426-Fix-last-firework-in-stack-not-having-effects-when-d.patch

@@ -1,4 +1,4 @@
-From 157b9e959f6d0e0db85fd8b4993f902e89772ecb Mon Sep 17 00:00:00 2001
+From 9fc6ac16d10154e8a5c38be02d2625eee61a091f Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 17 Jan 2020 18:44:55 -0800
 Subject: [PATCH] Fix last firework in stack not having effects when dispensed
@@ -9,7 +9,7 @@ dispensed. The resulting item would have size == 0 and therefore
 be convertered to air, hence why the effects disappeared.
 
 diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java
-index 9a8be1474..02d2e9a84 100644
+index b6b7e3c6c..3af686c7f 100644
 --- a/src/main/java/net/minecraft/server/IDispenseBehavior.java
 +++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java
 @@ -265,7 +265,7 @@ public interface IDispenseBehavior {
@@ -22,5 +22,5 @@ index 9a8be1474..02d2e9a84 100644
                  entityfireworks.shoot(d0, d1, d2, 0.5F, 1.0F);
                  isourceblock.getWorld().addEntity(entityfireworks);
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0427-Activation-Range-Improvements.patch

@@ -1,4 +1,4 @@
-From c6b2ab2e34eb91baeed7701d11692f5eb887b00c Mon Sep 17 00:00:00 2001
+From 0ef41ed35dc8014ce9738976f227f37ca324e3aa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Activation Range Improvements
@@ -10,7 +10,7 @@ Fixes and adds new Immunities to improve gameplay behavior
 Adds water Mobs to activation range config and nerfs fish
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index bbfbe4b1e9..c1ffd6dc1c 100644
+index 2917e1bd4..ac34a1008 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -554,6 +554,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -22,7 +22,7 @@ index bbfbe4b1e9..c1ffd6dc1c 100644
                  if (vec3d.equals(Vec3D.a)) {
                      return;
 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index b40c8d2f83..4eda130750 100644
+index b40c8d2f8..4eda13075 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
 @@ -7,6 +7,7 @@ import org.bukkit.event.entity.EntityUnleashEvent;
@@ -34,7 +34,7 @@ index b40c8d2f83..4eda130750 100644
      protected EntityCreature(EntityTypes<? extends EntityCreature> entitytypes, World world) {
          super(entitytypes, world);
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 5fb3c948d9..e0355d3a30 100644
+index 5fb3c948d..e0355d3a3 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -112,6 +112,17 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -56,7 +56,7 @@ index 5fb3c948d9..e0355d3a30 100644
          if (this.isPassenger() && this.getVehicle() instanceof EntityInsentient) {
              EntityInsentient entityinsentient = (EntityInsentient) this.getVehicle();
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 6d4d41c88c..193dbfc5f6 100644
+index 6d4d41c88..193dbfc5f 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -382,6 +382,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -68,7 +68,7 @@ index 6d4d41c88c..193dbfc5f6 100644
          return this.bJ != null;
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index f22f12eeb0..bdb90a3466 100644
+index f22f12eeb..bdb90a346 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
 @@ -20,7 +20,10 @@ public abstract class PathfinderGoal {
@@ -84,7 +84,7 @@ index f22f12eeb0..bdb90a3466 100644
      public void e() {}
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
-index 41fb166ce0..e93129f0b2 100644
+index 41fb166ce..e93129f0b 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 @@ -4,12 +4,12 @@ import java.util.EnumSet;
@@ -125,7 +125,7 @@ index 41fb166ce0..e93129f0b2 100644
                          }
                      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
-index 44bb18c594..935136771e 100644
+index 44bb18c59..935136771 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 @@ -24,10 +24,11 @@ public class PathfinderGoalSelector {
@@ -169,7 +169,7 @@ index 44bb18c594..935136771e 100644
          this.d.stream().filter((pathfindergoalwrapped) -> {
              return pathfindergoalwrapped.j() == pathfindergoal;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
-index 5a8c60ad90..29657fed75 100644
+index 5a8c60ad9..29657fed7 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
 @@ -64,6 +64,7 @@ public class PathfinderGoalWrapped extends PathfinderGoal {
@@ -181,7 +181,7 @@ index 5a8c60ad90..29657fed75 100644
          return this.c;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 92601c581c..6e165a1649 100644
+index 92601c581..6e165a164 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -33,12 +33,18 @@ import net.minecraft.server.MathHelper;
@@ -274,7 +274,7 @@ index 92601c581c..6e165a1649 100644
              isActive = false;
          }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index c2906f20a5..885512396f 100644
+index c2906f20a..885512396 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -180,6 +180,7 @@ public class SpigotWorldConfig

Spigot-Server-Patches/0428-Add-effect-to-block-break-naturally.patch

@@ -1,4 +1,4 @@
-From ae4b30a826b7fc0456698c2af3d82cf2f7efc8de Mon Sep 17 00:00:00 2001
+From 2e94cc6a5db7ef1811142ee532c3b7259565d1fe Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Jan 2020 12:25:07 -0600
 Subject: [PATCH] Add effect to block break naturally
@@ -30,5 +30,5 @@ index a667e58ed..78e84c3d6 100644
          }
  
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0429-Tracking-Range-Improvements.patch

@@ -1,4 +1,4 @@
-From 8c6b864839c730a3d0205080d8bdf5e0c21bcc93 Mon Sep 17 00:00:00 2001
+From 88d240ff34b481034069835a79f3b2a537150183 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Sat, 21 Dec 2019 15:22:09 -0500
 Subject: [PATCH] Tracking Range Improvements
@@ -8,7 +8,7 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code
 Also ignores Enderdragon, defaulting it to Mojang's setting
 
 diff --git a/src/main/java/org/spigotmc/TrackingRange.java b/src/main/java/org/spigotmc/TrackingRange.java
-index 6f8e6c1d07..46c33e6917 100644
+index 6f8e6c1d0..46c33e691 100644
 --- a/src/main/java/org/spigotmc/TrackingRange.java
 +++ b/src/main/java/org/spigotmc/TrackingRange.java
 @@ -1,6 +1,7 @@

Spigot-Server-Patches/0430-Fix-comparator-behavior-for-EntityPhanton-goal.patch

@@ -1,11 +1,11 @@
-From 05d3e07fcbf1e0c8638e5875d5ae2716edf9a487 Mon Sep 17 00:00:00 2001
+From 6546f6bc44b3cbfb74ef5c6f77010d406c9f2a41 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Wed, 22 Jan 2020 21:00:21 +0000
 Subject: [PATCH] Fix comparator behavior for EntityPhanton goal
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index 82323bf4ac..90eeddb1af 100644
+index 82323bf4a..90eeddb1a 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -224,7 +224,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {

Spigot-Server-Patches/0431-Fix-items-vanishing-through-end-portal.patch

@@ -1,4 +1,4 @@
-From 046994b57b14f711db5c7546c56b184d677d69ae Mon Sep 17 00:00:00 2001
+From 1e8da59b31454797447e9b1e37a52d16461a7ed3 Mon Sep 17 00:00:00 2001
 From: AJMFactsheets <AJMFactsheets@gmail.com>
 Date: Wed, 22 Jan 2020 19:52:28 -0600
 Subject: [PATCH] Fix items vanishing through end portal
@@ -13,7 +13,7 @@ Quickly loading the exact world spawn chunk before searching the
 heightmap resolves the issue without having to load all spawn chunks.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c1ffd6dc1c..f8461960e0 100644
+index ac34a1008..3db5ac19a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2599,6 +2599,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0432-Init-legacy-material-data.patch

@@ -1,4 +1,4 @@
-From 18d1e63fe8d950682ad5dbc1a17f9e546b04e80a Mon Sep 17 00:00:00 2001
+From e84c8fcfe99150c99a5d0fbb8ba2dde725ee1b81 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 23 Jan 2020 21:30:07 +0000
 Subject: [PATCH] Init legacy material data
@@ -9,7 +9,7 @@ outdated plugins. This patch should likely be dropped when spigot fixes
 their legacy data usage....
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 6a6e4fe486..8d93ad6b45 100644
+index 6a6e4fe48..8d93ad6b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -91,10 +91,6 @@ public final class CraftMagicNumbers implements UnsafeValues {

Spigot-Server-Patches/0433-Seed-based-feature-search.patch

@@ -1,4 +1,4 @@
-From d3a017dd1bdedd27276373fc7fe80d677f4a390e Mon Sep 17 00:00:00 2001
+From 31e07d72b58c1d2e04897ff8fd96ebbd7696093a Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Mon, 13 Jan 2020 15:40:32 +0100
 Subject: [PATCH] Seed based feature search
@@ -15,7 +15,7 @@ changes but this should usually not happen. A config option to disable
 this improvement is added though in case that should ever be necessary.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3b8488d3ff..bce502181f 100644
+index 3b8488d3f..bce502181 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -359,6 +359,12 @@ public class PaperWorldConfig {
@@ -32,7 +32,7 @@ index 3b8488d3ff..bce502181f 100644
      private void maxEntityCollision() {
          maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
 diff --git a/src/main/java/net/minecraft/server/BiomeManager.java b/src/main/java/net/minecraft/server/BiomeManager.java
-index e96f544f12..68423645df 100644
+index e96f544f1..68423645d 100644
 --- a/src/main/java/net/minecraft/server/BiomeManager.java
 +++ b/src/main/java/net/minecraft/server/BiomeManager.java
 @@ -12,10 +12,12 @@ public class BiomeManager {
@@ -49,7 +49,7 @@ index e96f544f12..68423645df 100644
          return this.c.a(this.b, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this.a);
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
-index f2a19acd84..09f1308b0d 100644
+index f2a19acd8..09f1308b0 100644
 --- a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
 +++ b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
 @@ -64,10 +64,12 @@ public class ChunkCoordIntPair {
@@ -66,7 +66,7 @@ index f2a19acd84..09f1308b0d 100644
          return this.z << 4;
      }
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index e8ce2ecf23..acfe732af5 100644
+index e8ce2ecf2..acfe732af 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -109,6 +109,15 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
@@ -94,7 +94,7 @@ index e8ce2ecf23..acfe732af5 100644
  
      public abstract StructureGenerator.a a();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 79175c637c..44fb13f8db 100644
+index a2f7c032d..e97b3f103 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1557,8 +1557,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

Spigot-Server-Patches/0434-Bees-get-gravity-in-void.-Fixes-MC-167279.patch

@@ -1,4 +1,4 @@
-From 1d2909cc9f91cdc5dc23e61bfcd2c1583ab8ea65 Mon Sep 17 00:00:00 2001
+From ce1fa2f83fae976cff6618e9b8259625ec45edf9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 26 Jan 2020 16:30:19 -0600
 Subject: [PATCH] Bees get gravity in void. Fixes MC-167279
@@ -54,5 +54,5 @@ index f67d66b9a..6154c4470 100644
          this.a(PathType.WATER, -1.0F);
          this.a(PathType.COCOA, -1.0F);
 -- 
-2.24.0
+2.25.0
 

Spigot-Server-Patches/0435-Optimise-getChunkAt-calls-for-loaded-chunks.patch

@@ -1,4 +1,4 @@
-From ac2f62038414f7fd389e4ef85e0f3479210caa9d Mon Sep 17 00:00:00 2001
+From 24ed4715052f8bea87e47c17cca35d61126cc999 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 25 Jan 2020 17:04:35 -0800
 Subject: [PATCH] Optimise getChunkAt calls for loaded chunks
@@ -84,5 +84,5 @@ index e97b3f103..913511388 100644
      }
  
 -- 
-2.25.0.windows.1
+2.25.0