Updated Upstream (Bukkit/CraftBukkit)

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

Bukkit Changes:
58d299a5 Clarify that TotalExperience (XpTotal) is not displayed anywhere
3342ab1e #460: Add Player#sendExperienceChange
acc05b40 SPIGOT-5525: saveResource saves files from server jars

CraftBukkit Changes:
5c6b0dc6 SPIGOT-5526: Call EntityChangeBlockEvent for bees triggering crop growth
b91ce119 #601: Implement Player#sendExperienceChange
661bebc6 Remove outdated build delay.

Spigot-API-Patches/0004-Timings-v2.patch

@@ -1,4 +1,4 @@
-From bbf376e0410c47c16785ba43f2223235d9f888bc Mon Sep 17 00:00:00 2001
+From 8367abf2c43595a130e0397c278da82e7d50f0b2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@@ -3714,10 +3714,10 @@ index 6023e4f6..00000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 010b4675..63c6d6a1 100644
+index 0052cc71..4d9ed678 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1554,6 +1554,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1579,6 +1579,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
@@ -3830,10 +3830,10 @@ index 1173e433..82e379d1 100644
                  eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
              } else {
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 0ffc1dfd..b859796b 100644
+index a0551225..7133be0a 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-@@ -24,7 +24,8 @@ import org.jetbrains.annotations.Nullable;
+@@ -25,7 +25,8 @@ import org.jetbrains.annotations.Nullable;
  /**
   * A ClassLoader for plugins, to allow shared classes across multiple plugins
   */
@@ -4114,5 +4114,5 @@ index b71235f6..3cbe5c2b 100644
 +
  }
 -- 
-2.24.0
+2.25.0
 

Spigot-API-Patches/0005-Player-affects-spawning-API.patch

@@ -1,14 +1,14 @@
-From 928d6548448689181ff2df6ff172e8a61f651213 Mon Sep 17 00:00:00 2001
+From 69623dfbf01028f91c52e15f6d096f85dad57354 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Mon, 29 Feb 2016 17:22:34 -0600
 Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 63c6d6a1..46912889 100644
+index 4d9ed678..89dcc9d4 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1450,6 +1450,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1475,6 +1475,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @NotNull
      public String getLocale();
  
@@ -32,5 +32,5 @@ index 63c6d6a1..46912889 100644
       * Update the list of commands sent to the client.
       * <br>
 -- 
-2.24.0
+2.25.0
 

Spigot-API-Patches/0010-Add-player-view-distance-API.patch

@@ -1,14 +1,14 @@
-From aacdd9bb06cfd6da30e880f569581d5852e5ba42 Mon Sep 17 00:00:00 2001
+From 6af56a2e1e0c3aa3a8a3fa62d936b6d74a255800 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 18:05:37 -0600
 Subject: [PATCH] Add player view distance API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 46912889..0fb36ebd 100644
+index 89dcc9d4..195c70d1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1464,6 +1464,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1489,6 +1489,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param affects Whether the player can affect mob spawning
       */
      public void setAffectsSpawning(boolean affects);
@@ -30,5 +30,5 @@ index 46912889..0fb36ebd 100644
  
      /**
 -- 
-2.24.0
+2.25.0
 

Spigot-API-Patches/0021-Complete-resource-pack-API.patch

@@ -1,14 +1,14 @@
-From c790b30bf69fbd5001c937a33018dd83e72a9153 Mon Sep 17 00:00:00 2001
+From 6f43acffa83a9b928af1474f6cba3daa45813dc3 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 22:59:54 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 81677fcd..d1290ab3 100644
+index 2017a51d..307e5568 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1200,7 +1200,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1225,7 +1225,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the URL is null.
       * @throws IllegalArgumentException Thrown if the URL is too long. The
       *     length restriction is an implementation specific arbitrary value.
@@ -18,7 +18,7 @@ index 81677fcd..d1290ab3 100644
      public void setResourcePack(@NotNull String url);
  
      /**
-@@ -1638,6 +1640,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1663,6 +1665,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void openBook(@NotNull ItemStack book);
  
@@ -119,5 +119,5 @@ index b9819565..4c2102a1 100644
       * Gets the status of this pack.
       *
 -- 
-2.24.0
+2.25.0
 

Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch

@@ -1,11 +1,11 @@
-From 309fd45f13802f3b9798340addc0526ba1ad9ded Mon Sep 17 00:00:00 2001
+From fe8cbc53a90843f7467aacb0e1de2206794758ce Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:55:55 -0500
 Subject: [PATCH] Add String based Action Bar API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d1290ab3..63e5197d 100644
+index 307e5568..85a5637f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -444,6 +444,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -47,7 +47,7 @@ index d1290ab3..63e5197d 100644
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
-@@ -1769,9 +1791,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1794,9 +1816,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          /**
           * Sends the component to the specified screen position of this player
           *
@@ -59,7 +59,7 @@ index d1290ab3..63e5197d 100644
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1779,9 +1803,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1804,9 +1828,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          /**
           * Sends an array of components as a single message to the specified screen position of this player
           *
@@ -72,5 +72,5 @@ index d1290ab3..63e5197d 100644
              throw new UnsupportedOperationException("Not supported yet.");
          }
 -- 
-2.24.0
+2.25.0
 

Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch

@@ -1,4 +1,4 @@
-From 126e2c296d25f98ddc5ecf6193e0a9c674b78637 Mon Sep 17 00:00:00 2001
+From bf3a1674d443421c9ad56d00cb9d410e0882c544 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 10 Jun 2017 16:59:40 -0500
 Subject: [PATCH] Fix upstream javadoc warnings and errors
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors
 Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index df4caf296..ca60c5148 100644
+index df4caf29..ca60c514 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1862,6 +1862,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -74,7 +74,7 @@ index df4caf296..ca60c5148 100644
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
  
 diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
-index c2096b534..bca9d3659 100644
+index c2096b53..bca9d365 100644
 --- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java
 +++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
 @@ -142,6 +142,7 @@ public interface AreaEffectCloud extends Entity {
@@ -86,7 +86,7 @@ index c2096b534..bca9d3659 100644
      <T> void setParticle(@NotNull Particle particle, @Nullable T data);
  
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 63e5197dc..881ccce50 100644
+index 85a5637f..da36c8df 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -459,7 +459,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -130,7 +130,7 @@ index 63e5197dc..881ccce50 100644
       * @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -1417,6 +1421,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1442,6 +1446,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -138,7 +138,7 @@ index 63e5197dc..881ccce50 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
  
-@@ -1433,6 +1438,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1458,6 +1463,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -146,7 +146,7 @@ index 63e5197dc..881ccce50 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
  
-@@ -1483,6 +1489,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1508,6 +1514,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -154,7 +154,7 @@ index 63e5197dc..881ccce50 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
  
-@@ -1503,6 +1510,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1528,6 +1535,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -162,7 +162,7 @@ index 63e5197dc..881ccce50 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
  
-@@ -1559,6 +1567,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1584,6 +1592,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -170,7 +170,7 @@ index 63e5197dc..881ccce50 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
  
-@@ -1581,6 +1590,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1606,6 +1615,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -179,7 +179,7 @@ index 63e5197dc..881ccce50 100644
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
  
 diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
-index 1b2267f4e..1a58734d9 100644
+index 1b2267f4..1a58734d 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
 @@ -78,7 +78,7 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
@@ -192,5 +192,5 @@ index 1b2267f4e..1a58734d9 100644
          return to;
      }
 -- 
-2.24.1
+2.25.0
 

Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch

@@ -1,4 +1,4 @@
-From f7565bc8c0d326ebd6500309d2d2cbc4b6ee51c9 Mon Sep 17 00:00:00 2001
+From 91259973846180ea7f731ae367e1f0f7f57a1782 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 19:41:20 +0200
 Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin
@@ -14,7 +14,7 @@ parent of the plugin logger to avoid this.
 
 diff --git a/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java
 new file mode 100644
-index 000000000..76f2cb9cd
+index 00000000..76f2cb9c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java
 @@ -0,0 +1,41 @@
@@ -60,7 +60,7 @@ index 000000000..76f2cb9cd
 +
 +}
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index bb2e55e97..04fa3991f 100644
+index bb2e55e9..04fa3991 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 @@ -42,7 +42,7 @@ public abstract class JavaPlugin extends PluginBase {
@@ -87,10 +87,10 @@ index bb2e55e97..04fa3991f 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index b859796b4..6f39f571d 100644
+index 7133be0a..9924780d 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-@@ -37,6 +37,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
+@@ -38,6 +38,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
      final JavaPlugin plugin;
      private JavaPlugin pluginInit;
      private IllegalStateException pluginState;
@@ -98,7 +98,7 @@ index b859796b4..6f39f571d 100644
  
      static {
          ClassLoader.registerAsParallelCapable();
-@@ -54,6 +55,8 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
+@@ -55,6 +56,8 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
          this.manifest = jar.getManifest();
          this.url = file.toURI().toURL();
  
@@ -107,7 +107,7 @@ index b859796b4..6f39f571d 100644
          try {
              Class<?> jarClass;
              try {
-@@ -171,6 +174,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
+@@ -182,6 +185,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
          pluginState = new IllegalStateException("Initial initialization");
          this.pluginInit = javaPlugin;
  
@@ -116,5 +116,5 @@ index b859796b4..6f39f571d 100644
      }
  }
 -- 
-2.21.0
+2.25.0
 

Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch

@@ -1,4 +1,4 @@
-From 27fb597be22c4610e04e02a92a7fea238fb3caa7 Mon Sep 17 00:00:00 2001
+From 5e862d3cce62af29bd527af00a7b5f936f76b334 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:28:55 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 2bd1af78..f9a3a3e5 100644
+index 420aa906..083110cc 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2,6 +2,7 @@ package org.bukkit.entity;
@@ -17,7 +17,7 @@ index 2bd1af78..f9a3a3e5 100644
  import org.bukkit.DyeColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -1747,6 +1748,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1772,6 +1773,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *         was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
       */
      boolean hasResourcePack();
@@ -39,5 +39,5 @@ index 2bd1af78..f9a3a3e5 100644
  
      // Spigot start
 -- 
-2.24.0
+2.25.0
 

Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch

@@ -1,14 +1,14 @@
-From 976bc055befda1c109616e17d0fafd815ded8770 Mon Sep 17 00:00:00 2001
+From d71fc46cccb94a231e306971414184d56ab42747 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:01:54 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 75bbbefd..e37c94e4 100644
+index 2c6ff39e..7f771b35 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1922,6 +1922,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1947,6 +1947,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param profile The new profile to use
       */
      void setPlayerProfile(@NotNull PlayerProfile profile);
@@ -36,5 +36,5 @@ index 75bbbefd..e37c94e4 100644
  
      // Spigot start
 -- 
-2.24.0
+2.25.0
 

Spigot-Server-Patches/0009-Timings-v2.patch

@@ -1,4 +1,4 @@
-From 98ffbd14fc75adf90dfadc490cfd0f26c28e66f4 Mon Sep 17 00:00:00 2001
+From 1a80bae7a79972b8da9e0371a218b0b1a93517fa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
 
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
 new file mode 100644
-index 0000000000..69e26a8267
+index 000000000..69e26a826
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,141 @@
@@ -153,7 +153,7 @@ index 0000000000..69e26a8267
 +}
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 new file mode 100644
-index 0000000000..3a79cde595
+index 000000000..3a79cde59
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +1,130 @@
@@ -288,7 +288,7 @@ index 0000000000..3a79cde595
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b6d470e594..f402a29b09 100644
+index b6d470e59..f402a29b0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
@@ -335,7 +335,7 @@ index b6d470e594..f402a29b09 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index cd72a9c845..5de881371a 100644
+index cd72a9c84..5de881371 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -31,6 +31,15 @@ public class Block implements IMaterial {
@@ -355,7 +355,7 @@ index cd72a9c845..5de881371a 100644
      private final float frictionFactor;
      private final float f;
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index dcaf3a509a..5f90312572 100644
+index dcaf3a509..5f9031257 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -567,6 +567,7 @@ public class Chunk implements IChunkAccess {
@@ -375,7 +375,7 @@ index dcaf3a509a..5f90312572 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index c5121d3692..459baf26d2 100644
+index c5121d369..459baf26d 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -129,11 +129,13 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -487,7 +487,7 @@ index c5121d3692..459baf26d2 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index e16d30f2ca..4af5a230ba 100644
+index e16d30f2c..4af5a230b 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -1,5 +1,6 @@
@@ -525,7 +525,7 @@ index e16d30f2ca..4af5a230ba 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java
-index c3218fbc39..94195a7f93 100644
+index c3218fbc3..94195a7f9 100644
 --- a/src/main/java/net/minecraft/server/CustomFunction.java
 +++ b/src/main/java/net/minecraft/server/CustomFunction.java
 @@ -13,12 +13,22 @@ public class CustomFunction {
@@ -552,7 +552,7 @@ index c3218fbc39..94195a7f93 100644
          return this.b;
      }
 diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java
-index 334de8b041..872a6cbbbd 100644
+index 334de8b04..872a6cbbb 100644
 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java
 +++ b/src/main/java/net/minecraft/server/CustomFunctionData.java
 @@ -101,7 +101,7 @@ public class CustomFunctionData implements IResourcePackListener {
@@ -565,7 +565,7 @@ index 334de8b041..872a6cbbbd 100644
                  int j = 0;
                  CustomFunction.c[] acustomfunction_c = customfunction.b();
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 20ed423fa5..141673d00f 100644
+index 20ed423fa..141673d00 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -19,6 +19,8 @@ import java.util.Collections;
@@ -653,7 +653,7 @@ index 20ed423fa5..141673d00f 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2a5e8d34e9..bf059dc862 100644
+index a7e471066..5ae12e266 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -29,7 +29,8 @@ import org.bukkit.command.CommandSender;
@@ -692,7 +692,7 @@ index 2a5e8d34e9..bf059dc862 100644
  
      protected BlockPosition ag() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 138bc38e68..906ca1bfaf 100644
+index 138bc38e6..906ca1bfa 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -37,7 +37,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -768,7 +768,7 @@ index 138bc38e68..906ca1bfaf 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a389fb5df2..49c0764f14 100644
+index a389fb5df..49c0764f1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -63,7 +63,7 @@ import org.bukkit.craftbukkit.CraftServer;
@@ -944,7 +944,7 @@ index a389fb5df2..49c0764f14 100644
          this.methodProfiler.exit();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index a4b246dc4f..cd15797502 100644
+index a4b246dc4..cd1579750 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,7 +1,9 @@
@@ -1026,7 +1026,7 @@ index a4b246dc4f..cd15797502 100644
  
      protected void broadcast(Entity entity, Packet<?> packet) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b257e1c4e9..b7beb058d8 100644
+index b257e1c4e..b7beb058d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -1081,7 +1081,7 @@ index b257e1c4e9..b7beb058d8 100644
          // this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
-index a677ec74d4..e928525b8f 100644
+index 2c671629a..eb3269e0e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -2,6 +2,8 @@ package net.minecraft.server;
@@ -1108,7 +1108,7 @@ index a677ec74d4..e928525b8f 100644
                      PlayerConnectionUtils.LOGGER.debug("Ignoring packet due to disconnection: " + packet);
                  }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 0694f4563e..1652a57e25 100644
+index 0694f4563..1652a57e2 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1132,7 +1132,7 @@ index 0694f4563e..1652a57e25 100644
  
      public WhiteList getWhitelist() {
 diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
-index 00bbd34b6a..f533860bbe 100644
+index 00bbd34b6..f533860bb 100644
 --- a/src/main/java/net/minecraft/server/TickListServer.java
 +++ b/src/main/java/net/minecraft/server/TickListServer.java
 @@ -28,13 +28,18 @@ public class TickListServer<T> implements TickList<T> {
@@ -1182,7 +1182,7 @@ index 00bbd34b6a..f533860bbe 100644
              this.g.clear();
          }
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 820180ab3f..fa6400dccd 100644
+index 820180ab3..fa6400dcc 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -9,11 +9,12 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer;
@@ -1201,7 +1201,7 @@ index 820180ab3f..fa6400dccd 100644
      private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
      public CraftPersistentDataContainer persistentDataContainer;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9f0fce400c..f1860809cd 100644
+index 9f0fce400..f1860809c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,7 @@
@@ -1256,7 +1256,7 @@ index 9f0fce400c..f1860809cd 100644
              CrashReport crashreport = CrashReport.a(throwable, "Ticking entity");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being ticked");
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c9646ebf70..924dd5e7f1 100644
+index c9646ebf7..924dd5e7f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1,6 +1,8 @@
@@ -1381,7 +1381,7 @@ index c9646ebf70..924dd5e7f1 100644
  
          // CraftBukkit start - moved from MinecraftServer.saveChunks
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 57ad50403b..038928789b 100644
+index 57ad50403..038928789 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1935,12 +1935,31 @@ public final class CraftServer implements Server {
@@ -1418,7 +1418,7 @@ index 57ad50403b..038928789b 100644
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 deleted file mode 100644
-index 2bd22a3698..0000000000
+index 2bd22a369..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -1,162 +0,0 @@
@@ -1585,10 +1585,10 @@ index 2bd22a3698..0000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4aac968d44..275c4a276e 100644
+index 9eba8449e..1094190fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1732,6 +1732,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1753,6 +1753,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }
@@ -1604,7 +1604,7 @@ index 4aac968d44..275c4a276e 100644
  
      public Player.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index b90979c7ba..8823f94f7b 100644
+index b90979c7b..8823f94f7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -1,5 +1,6 @@
@@ -1670,7 +1670,7 @@ index b90979c7ba..8823f94f7b 100644
  
      private boolean isReady(final int currentTick) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
-index 3f55381c15..0d9a466809 100644
+index 3f55381c1..0d9a46680 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -1,9 +1,11 @@
@@ -1755,7 +1755,7 @@ index 3f55381c15..0d9a466809 100644
 -    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
-index e52ef47b78..3d90b34268 100644
+index e52ef47b7..3d90b3426 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 @@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
@@ -1767,7 +1767,7 @@ index e52ef47b78..3d90b34268 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index adad3a0fa7..7d22aaffbf 100644
+index adad3a0fa..7d22aaffb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -288,6 +288,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -1785,7 +1785,7 @@ index adad3a0fa7..7d22aaffbf 100644
       * This helper class represents the different NBT Tags.
       * <p>
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index ca7789b5e0..4423839697 100644
+index ca7789b5e..442383969 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -31,7 +31,7 @@ import net.minecraft.server.EntityWither;
@@ -1846,5 +1846,5 @@ index ca7789b5e0..4423839697 100644
      }
  }
 -- 
-2.24.1
+2.25.0
 

Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch

@@ -1,11 +1,11 @@
-From 133d5f8a21cbdb3a186eded790e5d16ac82416a4 Mon Sep 17 00:00:00 2001
+From 8fef6035f0ea836e8208b66289ed875dc03c7119 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:14:15 -0600
 Subject: [PATCH] Drop falling block and tnt entities at the specified height
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8ee2b9bb1b..d59b82b7bb 100644
+index 8ee2b9bb1..d59b82b7b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -119,4 +119,14 @@ public class PaperWorldConfig {
@@ -24,7 +24,7 @@ index 8ee2b9bb1b..d59b82b7bb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index bf059dc862..2c36fc71c4 100644
+index 5ae12e266..384b892a4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1814,6 +1814,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -36,7 +36,7 @@ index bf059dc862..2c36fc71c4 100644
      public EntityItem a(ItemStack itemstack, float f) {
          if (itemstack.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 20cb7dbaf9..0342c873ac 100644
+index 20cb7dbaf..0342c873a 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -85,6 +85,16 @@ public class EntityFallingBlock extends Entity {
@@ -57,7 +57,7 @@ index 20cb7dbaf9..0342c873ac 100644
                  blockposition = new BlockPosition(this);
                  boolean flag = this.block.getBlock() instanceof BlockConcretePowder;
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index d042124362..33c51dced7 100644
+index d04212436..33c51dced 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -54,6 +54,11 @@ public class EntityTNTPrimed extends Entity {
@@ -73,10 +73,10 @@ index d042124362..33c51dced7 100644
          if (this.onGround) {
              this.setMot(this.getMot().d(0.7D, -0.5D, 0.7D));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 275c4a276e..0bb5bb9aab 100644
+index 1094190fd..35dbed40d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -835,7 +835,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -836,7 +836,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setStatistic(Statistic statistic, EntityType entityType, int newValue) {
@@ -86,5 +86,5 @@ index 275c4a276e..0bb5bb9aab 100644
          Validate.isTrue(newValue >= 0, "Value must be greater than or equal to 0");
          Validate.isTrue(statistic.getType() == Type.ENTITY, "This statistic does not take an EntityType parameter");
 -- 
-2.24.1
+2.25.0
 

Spigot-Server-Patches/0020-Player-affects-spawning-API.patch

@@ -1,11 +1,11 @@
-From 3564e5e18f9624bea327dea16e3d632c7f332e34 Mon Sep 17 00:00:00 2001
+From 2bb7bc0363be41f9ab07fe70282b52dfc32f3a65 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 33470b5946..bf5e949c35 100644
+index 33470b594..bf5e949c3 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -71,6 +71,9 @@ public abstract class EntityHuman extends EntityLiving {
@@ -19,7 +19,7 @@ index 33470b5946..bf5e949c35 100644
      // CraftBukkit start
      public boolean fauxSleeping;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index e1c254dd55..f389e5565e 100644
+index e1c254dd5..f389e5565 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -619,7 +619,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -32,7 +32,7 @@ index e1c254dd55..f389e5565e 100644
  
                  if (d0 > world.paperConfig.hardDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // Paper - custom despawn distances
 diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
-index 102b3a3c48..08c2a22f7a 100644
+index 102b3a3c4..08c2a22f7 100644
 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java
 +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
 @@ -99,7 +99,7 @@ public class EntitySilverfish extends EntityMonster {
@@ -45,10 +45,10 @@ index 102b3a3c48..08c2a22f7a 100644
              return false;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0bb5bb9aab..0a222f1f66 100644
+index 35dbed40d..f7a4fdb83 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1640,7 +1640,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1661,7 +1661,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public String getLocale() {
          return getHandle().locale;
@@ -69,5 +69,5 @@ index 0bb5bb9aab..0a222f1f66 100644
      @Override
      public void updateCommands() {
 -- 
-2.24.1
+2.25.0
 

Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch

@@ -1,14 +1,14 @@
-From 2ec3f5165d20e94eb3c32a3de5fbb1a801a9dd99 Mon Sep 17 00:00:00 2001
+From e95304620ecb6fec01564333a4c012787b513870 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:12:03 -0600
 Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0a222f1f66..9eb7a48e56 100644
+index f7a4fdb83..918045408 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1329,12 +1329,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1350,12 +1350,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setFlying(boolean value) {
@@ -24,5 +24,5 @@ index 0a222f1f66..9eb7a48e56 100644
  
      @Override
 -- 
-2.24.1
+2.25.0
 

Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch

@@ -1,4 +1,4 @@
-From 591d96f983925b1f11835a5820a718022391c25f Mon Sep 17 00:00:00 2001
+From b5b16593609b5cb8671f34aba347a44b0b09eea7 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -52,7 +52,7 @@ index 3a6e78000..535056c64 100644
  
          if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f0e06ad0e..7ca32d0be 100644
+index 918045408..bbf5a652f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
@@ -62,7 +62,7 @@ index f0e06ad0e..7ca32d0be 100644
  import com.google.common.base.Preconditions;
  import com.google.common.collect.ImmutableSet;
  import com.google.common.io.BaseEncoding;
-@@ -210,6 +211,96 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -211,6 +212,96 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
@@ -160,5 +160,5 @@ index f0e06ad0e..7ca32d0be 100644
      public String getDisplayName() {
          return getHandle().displayName;
 -- 
-2.24.0
+2.25.0
 

Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch

@@ -1,4 +1,4 @@
-From 2d84b102ac24e02391c19589b89432803f4a63d7 Mon Sep 17 00:00:00 2001
+From 89d3401e484feef419f291e5a3becd7a54ea107f Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Configurable inter-world teleportation safety
@@ -30,10 +30,10 @@ index cd47a4ca0..abbf59bb9 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c6624cf08..a80c0164a 100644
+index bbf5a652f..658854dc9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -759,7 +759,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -760,7 +760,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (fromWorld == toWorld) {
              entity.playerConnection.teleport(to);
          } else {
@@ -43,5 +43,5 @@ index c6624cf08..a80c0164a 100644
          return true;
      }
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0058-Complete-resource-pack-API.patch

@@ -1,11 +1,11 @@
-From 3121febf6563ddfdff9b7b41316242ae3e7f0ca6 Mon Sep 17 00:00:00 2001
+From 0ec882ebb0a37aab44304a8121daee30f7ad733a Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index fae57fc2cf..d90c6a732a 100644
+index fae57fc2c..d90c6a732 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1334,7 +1334,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -22,10 +22,10 @@ index fae57fc2cf..d90c6a732a 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a80c0164a3..6ff6d646a5 100644
+index 658854dc9..2cdea9f5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -133,6 +133,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -134,6 +134,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private double health = 20;
      private boolean scaledHealth = false;
      private double healthScale = 20;
@@ -36,7 +36,7 @@ index a80c0164a3..6ff6d646a5 100644
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
          super(server, entity);
-@@ -1744,6 +1748,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1765,6 +1769,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean getAffectsSpawning() {
          return this.getHandle().affectsSpawning;
      }
@@ -70,5 +70,5 @@ index a80c0164a3..6ff6d646a5 100644
  
      @Override
 -- 
-2.24.1
+2.25.0
 

Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch

@@ -1,11 +1,11 @@
-From d4f12cff52af6917131cd122eb4b653dace16c06 Mon Sep 17 00:00:00 2001
+From 4e76e29a4af2856f6b1e20d874d621ac17c9502e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 14097275c8..bdbd899960 100644
+index 14097275c..bdbd89996 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -496,7 +496,13 @@ public abstract class EntityLiving extends Entity {
@@ -44,10 +44,10 @@ index 14097275c8..bdbd899960 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6ff6d646a5..a874b328ce 100644
+index 2cdea9f5d..8688b727a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1563,6 +1563,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1584,6 +1584,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setRealHealth(double health) {
@@ -56,5 +56,5 @@ index 6ff6d646a5..a874b328ce 100644
      }
  
 -- 
-2.24.1
+2.25.0
 

Spigot-Server-Patches/0086-Workaround-for-setting-passengers-on-players.patch

@@ -1,4 +1,4 @@
-From f11be05c43e237a594e761193a06473e0326859d Mon Sep 17 00:00:00 2001
+From 7ee6c719c0ddc2ae644174b3952ba4e02035605d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 10 Apr 2016 03:23:32 -0500
 Subject: [PATCH] Workaround for setting passengers on players
@@ -6,10 +6,10 @@ Subject: [PATCH] Workaround for setting passengers on players
 SPIGOT-1915 & GH-114
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a874b328ce..74a0ceba64 100644
+index 8688b727a..5647eb135 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -768,6 +768,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -769,6 +769,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return true;
      }
  
@@ -28,5 +28,5 @@ index a874b328ce..74a0ceba64 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.24.1
+2.25.0
 

Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch

@@ -1,4 +1,4 @@
-From f0e4524e92aa546ee5c57aba4c1940a84faf0ddb Mon Sep 17 00:00:00 2001
+From 6f4c8c4c2821aefc9c4b9d9559145754d8387185 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
@@ -40,10 +40,10 @@ index 586c9c8ce..de4634486 100644
          this.ci = packetplayinsettings.e();
          this.getDataWatcher().set(EntityPlayer.bq, (byte) packetplayinsettings.f());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 74a0ceba6..fe26ce3af 100644
+index 5647eb135..447ecf636 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1747,8 +1747,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1768,8 +1768,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public String getLocale() {
@@ -56,7 +56,7 @@ index 74a0ceba6..fe26ce3af 100644
      }
  
      // Paper start
-@@ -1835,7 +1837,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1856,7 +1858,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              }
          }
  
@@ -65,5 +65,5 @@ index 74a0ceba6..fe26ce3af 100644
          {
              Set<Player> ret = new HashSet<Player>();
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0135-String-based-Action-Bar-API.patch

@@ -1,11 +1,11 @@
-From df57c6fea7e013d6a3f910b96026baf86c7b5b76 Mon Sep 17 00:00:00 2001
+From bac065c13e2c9a7d34d770074889a669dfa7cb21 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
 
 
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 628b73a12d..2f10dab36c 100644
+index 628b73a12..2f10dab36 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -42,10 +42,10 @@ index 628b73a12d..2f10dab36c 100644
      public static boolean isMainThread() {
          return MinecraftServer.getServer().isMainThread();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6cf85f0703..1c41f00551 100644
+index 447ecf636..3a2a88618 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -216,6 +216,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -217,6 +217,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      // Paper start
@@ -65,5 +65,5 @@ index 6cf85f0703..1c41f00551 100644
      public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
           if (header != null) {
 -- 
-2.24.1
+2.25.0
 

Spigot-Server-Patches/0150-Use-TerminalConsoleAppender-for-console-improvements.patch

@@ -1,4 +1,4 @@
-From 1d3f1f1d45631a0ce0d518a2b55e88bfc6eb7271 Mon Sep 17 00:00:00 2001
+From 21da989cf9e5f7f7d6b5737d927d5209eff853db Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 9 Jun 2017 19:03:43 +0200
 Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@@ -258,7 +258,7 @@ index 1eb53f67e..308bc3baf 100644
  
          this.k = new GameProfileBanList(PlayerList.b);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 77bb68605..cd58906ad 100644
+index f01d3d382..05efbd67d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -41,7 +41,6 @@ import java.util.function.Consumer;
@@ -284,7 +284,7 @@ index 77bb68605..cd58906ad 100644
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 4a4e56e76..b562e95dc 100644
+index c9c95752a..4572b302c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -13,7 +13,7 @@ import java.util.logging.Logger;
@@ -323,7 +323,7 @@ index 4a4e56e76..b562e95dc 100644
 +                    System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
                  }
  
-                 if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
+                 if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
 @@ -226,7 +236,7 @@ public class Main {
                      System.out.println("Unable to read system info");
                  }
@@ -609,5 +609,5 @@ index 490a9acc7..08b6bb7f9 100644
              <AppenderRef ref="TerminalConsole" level="info"/>
          </Root>
 -- 
-2.24.1
+2.25.0
 

Spigot-Server-Patches/0177-Expose-client-protocol-version-and-virtual-host.patch

@@ -1,4 +1,4 @@
-From 7f1fa0582f4ece4ddf2d2721dfe17014279fba58 Mon Sep 17 00:00:00 2001
+From f8d0b154e05d43282e673789e760d97f2f238204 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:45:20 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose client protocol version and virtual host
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 new file mode 100644
-index 0000000000..5caca6439d
+index 000000000..5caca6439
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 @@ -0,0 +1,50 @@
@@ -61,7 +61,7 @@ index 0000000000..5caca6439d
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index d0b9c6e3dc..8928d93e49 100644
+index d0b9c6e3d..8928d93e4 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -15,6 +15,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -84,7 +84,7 @@ index d0b9c6e3dc..8928d93e49 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 3ccf166366..e2d8ed88f0 100644
+index 3ccf16636..e2d8ed88f 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -60,6 +60,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -99,7 +99,7 @@ index 3ccf166366..e2d8ed88f0 100644
      public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
          this.h = enumprotocoldirection;
 diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
-index 4f008e4723..8545146fb1 100644
+index 4f008e472..8545146fb 100644
 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 @@ -35,6 +35,7 @@ public class PacketHandshakingInSetProtocol implements Packet<PacketHandshakingI
@@ -111,10 +111,10 @@ index 4f008e4723..8545146fb1 100644
          return this.a;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1c41f00551..d47b982e7a 100644
+index 3a2a88618..5b5f2418e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -183,6 +183,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -184,6 +184,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
@@ -136,5 +136,5 @@ index 1c41f00551..d47b982e7a 100644
      public double getEyeHeight(boolean ignorePose) {
          if (ignorePose) {
 -- 
-2.24.1
+2.25.0
 

Spigot-Server-Patches/0189-Ability-to-apply-mending-to-XP-API.patch

@@ -1,4 +1,4 @@
-From bb6452ae079a306d75114b7a257b9911746d80df Mon Sep 17 00:00:00 2001
+From 6f4caccabb863282eaa9bdbe79f1d60c97923af0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:36:49 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index 1822178e8d..fabc7a8dd7 100644
+index 1822178e8..fabc7a8dd 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -246,6 +246,11 @@ public class EnchantmentManager {
@@ -26,7 +26,7 @@ index 1822178e8d..fabc7a8dd7 100644
      public static Entry<EnumItemSlot, ItemStack> b(Enchantment enchantment, EntityLiving entityliving) {
          Map<EnumItemSlot, ItemStack> map = enchantment.a(entityliving);
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index b3edb69a96..87c6b77ce3 100644
+index b3edb69a9..87c6b77ce 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -254,10 +254,12 @@ public class EntityExperienceOrb extends Entity {
@@ -43,10 +43,10 @@ index b3edb69a96..87c6b77ce3 100644
          return i * 2;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index da370b3462..1b6a3570b0 100644
+index 5b5f2418e..6f47768c9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1052,8 +1052,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1053,8 +1053,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return GameMode.getByValue(getHandle().playerInteractManager.getGameMode().getId());
      }
  
@@ -86,5 +86,5 @@ index da370b3462..1b6a3570b0 100644
      }
  
 -- 
-2.24.1
+2.25.0
 

Spigot-Server-Patches/0206-Player.setPlayerProfile-API.patch

@@ -1,4 +1,4 @@
-From ac05ce0883009a855bf194cf45f0b00df2136798 Mon Sep 17 00:00:00 2001
+From c17321568e2cff1078506c6d8c97f0b3dc277c6f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:29:48 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 0d3dceba6e..1aa373ed36 100644
+index 0d3dceba6..1aa373ed3 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -66,7 +66,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -19,7 +19,7 @@ index 0d3dceba6e..1aa373ed36 100644
      private final ItemCooldown bW;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 0614976b86..a985ae7ba0 100644
+index 0614976b8..a985ae7ba 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -37,7 +37,7 @@ public class LoginListener implements PacketLoginInListener {
@@ -48,7 +48,7 @@ index 0614976b86..a985ae7ba0 100644
                              uniqueId = i.getId();
                              // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1b6a3570b0..6637ff600f 100644
+index 6f47768c9..c3f8f3f4c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,6 +1,8 @@
@@ -60,7 +60,7 @@ index 1b6a3570b0..6637ff600f 100644
  import com.google.common.base.Preconditions;
  import com.google.common.collect.ImmutableSet;
  import com.google.common.io.BaseEncoding;
-@@ -1190,8 +1192,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1211,8 +1213,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          hiddenPlayers.put(player.getUniqueId(), hidingPlugins);
  
          // Remove this player from the hidden player's EntityTrackerEntry
@@ -75,7 +75,7 @@ index 1b6a3570b0..6637ff600f 100644
          PlayerChunkMap.EntityTracker entry = tracker.trackedEntities.get(other.getId());
          if (entry != null) {
              entry.clear(getHandle());
-@@ -1232,8 +1239,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1253,8 +1260,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          hiddenPlayers.remove(player.getUniqueId());
  
@@ -90,7 +90,7 @@ index 1b6a3570b0..6637ff600f 100644
  
          getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, other));
  
-@@ -1242,6 +1254,46 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1263,6 +1275,46 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              entry.updatePlayer(getHandle());
          }
      }
@@ -138,5 +138,5 @@ index 1b6a3570b0..6637ff600f 100644
      public void removeDisconnectingPlayer(Player player) {
          hiddenPlayers.remove(player.getUniqueId());
 -- 
-2.24.1
+2.25.0
 

Spigot-Server-Patches/0212-Flag-to-disable-the-channel-limit.patch

@@ -1,4 +1,4 @@
-From 65a1cd4c4b8b2df58d2596ad0e8d8e2c19b125c8 Mon Sep 17 00:00:00 2001
+From 1b4ab63e7c443d50e49617d8c487370b90f650a6 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 31 Mar 2018 17:04:26 +0100
 Subject: [PATCH] Flag to disable the channel limit
@@ -9,10 +9,10 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6637ff600f..78a3280995 100644
+index c3f8f3f4c..f4affa693 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -138,6 +138,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -139,6 +139,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Paper start
      private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
      private String resourcePackHash;
@@ -20,7 +20,7 @@ index 6637ff600f..78a3280995 100644
      // Paper end
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
-@@ -1456,7 +1457,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1477,7 +1478,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void addChannel(String channel) {
@@ -30,5 +30,5 @@ index 6637ff600f..78a3280995 100644
          if (channels.add(channel)) {
              server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
 -- 
-2.24.1
+2.25.0
 

Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch

@@ -1,4 +1,4 @@
-From 9ae19da684f14a024a586c46e53b06675ea9f551 Mon Sep 17 00:00:00 2001
+From 41d659c8d3733aa980d3d3f0c18fd2e030bfe76b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -155,10 +155,10 @@ index cd8ad2704..e169679c8 100644
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 78a328099..b93bafb3f 100644
+index f4affa693..c1f392716 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -785,7 +785,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -786,7 +786,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          // Close any foreign inventory
          if (getHandle().activeContainer != getHandle().defaultContainer) {
@@ -193,5 +193,5 @@ index caf277439..f931fa48b 100644
          human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity());
      }
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0292-Expose-attack-cooldown-methods-for-Player.patch

@@ -1,11 +1,11 @@
-From 5eb478cb69683d4a4583e314127d9d38ffbef2f3 Mon Sep 17 00:00:00 2001
+From fe6d14adaee1040cb699f63890f354a5db427561 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:02:00 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 2265b01e69..763ca58d17 100644
+index 2265b01e6..763ca58d1 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -2115,14 +2115,17 @@ public abstract class EntityHuman extends EntityLiving {
@@ -27,10 +27,10 @@ index 2265b01e69..763ca58d17 100644
          this.aB = 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b93bafb3ff..4b45986257 100644
+index c1f392716..352ef3669 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1916,6 +1916,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1937,6 +1937,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          getInventory().setItemInMainHand(hand);
      }
  
@@ -52,5 +52,5 @@ index b93bafb3ff..4b45986257 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.24.1
+2.25.0
 

Spigot-Server-Patches/0293-Improve-death-events.patch

@@ -1,4 +1,4 @@
-From 9a9f4264dd9cc4f0dd1d76bbf61b9aac6b3d5c64 Mon Sep 17 00:00:00 2001
+From 1ade9a3c92b252555cbebebd3e707286b9389166 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -27,7 +27,7 @@ index 6daa400d2..38fe29f8a 100644
          int i = this.f ? 300 : 100;
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d2d49ba47..f110e5241 100644
+index 109f1f614..9195a94a9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1503,6 +1503,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -279,7 +279,7 @@ index 1592a705f..b59b39d41 100644
          return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 0ac63f0ba..02a1b2029 100644
+index 2419feba7..67062635c 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -357,10 +357,10 @@ index 90fdf89c8..b761a41dc 100644
          this.minecraftKey = minecraftKey;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4b4598625..d9440753f 100644
+index 352ef3669..a2bda708c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1709,7 +1709,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1730,7 +1730,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void sendHealthUpdate() {
@@ -447,5 +447,5 @@ index f006b441a..39ce40bd5 100644
       * Server methods
       */
 -- 
-2.24.1
+2.25.0
 

Spigot-Server-Patches/0341-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch

@@ -1,4 +1,4 @@
-From 04af82194f228b45c74c47231796de12b0153eba Mon Sep 17 00:00:00 2001
+From 17aadebc3d123540f48d5d62efc82c88a3cdbd5d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 2 Jan 2019 00:35:43 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 784e472fb6..8276010a50 100644
+index 15a21ce59..8d4cac430 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -28,7 +28,7 @@ index 784e472fb6..8276010a50 100644
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index e46436623c..659ce21818 100644
+index e46436623..659ce2181 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -94,6 +94,7 @@ public abstract class PlayerList {
@@ -40,7 +40,7 @@ index e46436623c..659ce21818 100644
          UserCache usercache = this.server.getUserCache();
          GameProfile gameprofile1 = usercache.getProfile(gameprofile.getId());
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index c1ef1c950d..3824180ee5 100644
+index c1ef1c950..3824180ee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -256,6 +256,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@@ -106,10 +106,10 @@ index c1ef1c950d..3824180ee5 100644
      public Location getBedSpawnLocation() {
          NBTTagCompound data = getData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d9440753f5..ed93b1be25 100644
+index a2bda708c..37fce38df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -139,6 +139,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -140,6 +140,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
      private String resourcePackHash;
      private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit
@@ -117,7 +117,7 @@ index d9440753f5..ed93b1be25 100644
      // Paper end
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
-@@ -1360,6 +1361,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1381,6 +1382,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.firstPlayed = firstPlayed;
      }
  
@@ -136,7 +136,7 @@ index d9440753f5..ed93b1be25 100644
      public void readExtraData(NBTTagCompound nbttagcompound) {
          hasPlayedBefore = true;
          if (nbttagcompound.hasKey("bukkit")) {
-@@ -1382,6 +1395,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1403,6 +1416,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setExtraData(NBTTagCompound nbttagcompound) {
@@ -145,7 +145,7 @@ index d9440753f5..ed93b1be25 100644
          if (!nbttagcompound.hasKey("bukkit")) {
              nbttagcompound.set("bukkit", new NBTTagCompound());
          }
-@@ -1396,6 +1411,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1417,6 +1432,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          data.setLong("firstPlayed", getFirstPlayed());
          data.setLong("lastPlayed", System.currentTimeMillis());
          data.setString("lastKnownName", handle.getName());
@@ -163,5 +163,5 @@ index d9440753f5..ed93b1be25 100644
  
      @Override
 -- 
-2.24.1
+2.25.0
 

Spigot-Server-Patches/0345-Block-Entity-remove-from-being-called-on-Players.patch

@@ -1,4 +1,4 @@
-From 041a1c37bdba96f90fecf089fedf2d295e2756f6 Mon Sep 17 00:00:00 2001
+From 7b15289fa17f70f53be0b15202333146c496356c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Feb 2019 23:33:24 -0500
 Subject: [PATCH] Block Entity#remove from being called on Players
@@ -12,10 +12,10 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ed93b1be25..f4b84c3a64 100644
+index 37fce38df..90c251c90 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1961,6 +1961,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1982,6 +1982,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetCooldown() {
          getHandle().resetCooldown();
      }
@@ -32,5 +32,5 @@ index ed93b1be25..f4b84c3a64 100644
  
      // Spigot start
 -- 
-2.24.1
+2.25.0
 

Spigot-Server-Patches/0369-Per-Player-View-Distance-API-placeholders.patch

@@ -1,4 +1,4 @@
-From 88166e643a61e1858823606d9f88abd230b3bfd6 Mon Sep 17 00:00:00 2001
+From 2ecd9718e01498584a592a18b61a610dcbfc1179 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 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 3df8e30ec7..9acdd6e566 100644
+index 3df8e30ec..9acdd6e56 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -579,9 +579,9 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -23,7 +23,7 @@ index 3df8e30ec7..9acdd6e566 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 2e95069c19..8977c3516b 100644
+index 2e95069c1..8977c3516 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,10 +39,10 @@ index 2e95069c19..8977c3516b 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 f4b84c3a64..3afcfeae11 100644
+index 90c251c90..c1acec87f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1970,6 +1970,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1991,6 +1991,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              super.remove();
          }
      }
@@ -60,5 +60,5 @@ index f4b84c3a64..3afcfeae11 100644
  
      // Spigot start
 -- 
-2.24.1
+2.25.0
 

work/Bukkit

@@ -1 +1 @@
-Subproject commit a721c4ff26953a4fdb8d7c6a21be8215a52f59a2
+Subproject commit 58d299a56f783ba04943502d709d86d5a4227daa

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 752cf95e37f2356087bf051f26adc399b33b710a
+Subproject commit 5c6b0dc6e41b0e416b2f90e51f220a1f956dbc5f