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:
122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches
a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType()

CraftBukkit Changes:
bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException
3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches
95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType()
4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current

Spigot-API-Patches/0001-POM-changes.patch

@@ -1,11 +1,11 @@
-From 4ad4bdf9fc777147561c4f62fbd84bba4fef3271 Mon Sep 17 00:00:00 2001
+From 755a3e8943286365b0f518c5423687872c8181ae Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 00:16:08 +0100
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 044afc49..8c443c52 100644
+index 8964b9e33..ce09baeab 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -2,34 +2,28 @@
@@ -111,5 +111,5 @@ index 044afc49..8c443c52 100644
                      <shadedArtifactAttached>true</shadedArtifactAttached>
                  </configuration>
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch

@@ -1,4 +1,4 @@
-From c34a0b40b799e91263262c942be9994f6aaed9b7 Mon Sep 17 00:00:00 2001
+From 747cc281e224953dc859384efe4466cb165a90ef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 1 Apr 2016 00:02:47 -0400
 Subject: [PATCH] Add FastUtil to Bukkit
@@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization
 
 diff --git a/pom.xml b/pom.xml
-index 8c443c52..a540adef 100644
+index ce09baeab..3cfbff14b 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -49,6 +49,12 @@
@@ -23,5 +23,5 @@ index 8c443c52..a540adef 100644
              <groupId>commons-lang</groupId>
              <artifactId>commons-lang</artifactId>
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0003-Paper-Utils.patch

@@ -1,4 +1,4 @@
-From 987a04e5fe2faa15848c4e8ce6c6c63e12da47cd Mon Sep 17 00:00:00 2001
+From d7f401b6507cf6813a6e17cd0ad3df6d35d3a9e7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 23 Feb 2019 11:26:21 -0500
 Subject: [PATCH] Paper Utils
@@ -6,7 +6,7 @@ Subject: [PATCH] Paper Utils
 
 diff --git a/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java
 new file mode 100644
-index 00000000..9db0056a
+index 000000000..9db0056ab
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java
 @@ -0,0 +1,16 @@
@@ -27,5 +27,5 @@ index 00000000..9db0056a
 +
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From 954f387075f7d94134b6b65ebce3183d4dbd2b1d Mon Sep 17 00:00:00 2001
+From 1259145a44b220f48c733e013571a00df801065f 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
 
 diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
 new file mode 100644
-index 00000000..64531fcc
+index 000000000..64531fcce
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java
 @@ -0,0 +1,84 @@
@@ -96,7 +96,7 @@ index 00000000..64531fcc
 +}
 diff --git a/src/main/java/co/aikar/timings/NullTimingHandler.java b/src/main/java/co/aikar/timings/NullTimingHandler.java
 new file mode 100644
-index 00000000..9b45ce88
+index 000000000..9b45ce887
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/NullTimingHandler.java
 @@ -0,0 +1,68 @@
@@ -170,7 +170,7 @@ index 00000000..9b45ce88
 +}
 diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java
 new file mode 100644
-index 00000000..933ecf9b
+index 000000000..933ecf9bd
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
 @@ -0,0 +1,83 @@
@@ -259,7 +259,7 @@ index 00000000..933ecf9b
 +}
 diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java
 new file mode 100644
-index 00000000..a21e5ead
+index 000000000..a21e5ead5
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/Timing.java
 @@ -0,0 +1,83 @@
@@ -348,7 +348,7 @@ index 00000000..a21e5ead
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingData.java b/src/main/java/co/aikar/timings/TimingData.java
 new file mode 100644
-index 00000000..a5d13a1e
+index 000000000..a5d13a1e4
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingData.java
 @@ -0,0 +1,122 @@
@@ -476,7 +476,7 @@ index 00000000..a5d13a1e
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHandler.java b/src/main/java/co/aikar/timings/TimingHandler.java
 new file mode 100644
-index 00000000..cc0390c0
+index 000000000..cc0390c06
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHandler.java
 @@ -0,0 +1,227 @@
@@ -709,7 +709,7 @@ index 00000000..cc0390c0
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
 new file mode 100644
-index 00000000..ddaed812
+index 000000000..ddaed8127
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistory.java
 @@ -0,0 +1,354 @@
@@ -1069,7 +1069,7 @@ index 00000000..ddaed812
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHistoryEntry.java b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
 new file mode 100644
-index 00000000..86d5ac6b
+index 000000000..86d5ac6bd
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
 @@ -0,0 +1,58 @@
@@ -1133,7 +1133,7 @@ index 00000000..86d5ac6b
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingIdentifier.java b/src/main/java/co/aikar/timings/TimingIdentifier.java
 new file mode 100644
-index 00000000..df142a89
+index 000000000..df142a89b
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingIdentifier.java
 @@ -0,0 +1,116 @@
@@ -1255,7 +1255,7 @@ index 00000000..df142a89
 +}
 diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
 new file mode 100644
-index 00000000..0b34e0d0
+index 000000000..0b34e0d01
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/Timings.java
 @@ -0,0 +1,293 @@
@@ -1554,7 +1554,7 @@ index 00000000..0b34e0d0
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
 new file mode 100644
-index 00000000..c0d8f201
+index 000000000..c0d8f2016
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsCommand.java
 @@ -0,0 +1,122 @@
@@ -1682,7 +1682,7 @@ index 00000000..c0d8f201
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
 new file mode 100644
-index 00000000..93d5a3f9
+index 000000000..93d5a3f97
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
 @@ -0,0 +1,355 @@
@@ -2043,7 +2043,7 @@ index 00000000..93d5a3f9
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsManager.java b/src/main/java/co/aikar/timings/TimingsManager.java
 new file mode 100644
-index 00000000..ef824d70
+index 000000000..ef824d701
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsManager.java
 @@ -0,0 +1,188 @@
@@ -2237,7 +2237,7 @@ index 00000000..ef824d70
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsReportListener.java b/src/main/java/co/aikar/timings/TimingsReportListener.java
 new file mode 100644
-index 00000000..bf3e059f
+index 000000000..bf3e059fe
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsReportListener.java
 @@ -0,0 +1,75 @@
@@ -2318,7 +2318,7 @@ index 00000000..bf3e059f
 +}
 diff --git a/src/main/java/co/aikar/timings/UnsafeTimingHandler.java b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
 new file mode 100644
-index 00000000..632c4961
+index 000000000..632c49615
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
 @@ -0,0 +1,53 @@
@@ -2377,7 +2377,7 @@ index 00000000..632c4961
 +}
 diff --git a/src/main/java/co/aikar/util/Counter.java b/src/main/java/co/aikar/util/Counter.java
 new file mode 100644
-index 00000000..80155072
+index 000000000..80155072d
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/Counter.java
 @@ -0,0 +1,38 @@
@@ -2421,7 +2421,7 @@ index 00000000..80155072
 +}
 diff --git a/src/main/java/co/aikar/util/JSONUtil.java b/src/main/java/co/aikar/util/JSONUtil.java
 new file mode 100644
-index 00000000..190bf059
+index 000000000..190bf0598
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/JSONUtil.java
 @@ -0,0 +1,140 @@
@@ -2567,7 +2567,7 @@ index 00000000..190bf059
 +}
 diff --git a/src/main/java/co/aikar/util/LoadingIntMap.java b/src/main/java/co/aikar/util/LoadingIntMap.java
 new file mode 100644
-index 00000000..63a899c7
+index 000000000..63a899c7d
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/LoadingIntMap.java
 @@ -0,0 +1,76 @@
@@ -2649,7 +2649,7 @@ index 00000000..63a899c7
 +}
 diff --git a/src/main/java/co/aikar/util/LoadingMap.java b/src/main/java/co/aikar/util/LoadingMap.java
 new file mode 100644
-index 00000000..aedbb033
+index 000000000..aedbb0332
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/LoadingMap.java
 @@ -0,0 +1,368 @@
@@ -3023,7 +3023,7 @@ index 00000000..aedbb033
 +}
 diff --git a/src/main/java/co/aikar/util/MRUMapCache.java b/src/main/java/co/aikar/util/MRUMapCache.java
 new file mode 100644
-index 00000000..5989ee21
+index 000000000..5989ee212
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/MRUMapCache.java
 @@ -0,0 +1,111 @@
@@ -3139,7 +3139,7 @@ index 00000000..5989ee21
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ae21e0f9..75586936 100644
+index ae21e0f97..755869366 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -618,7 +618,6 @@ public final class Bukkit {
@@ -3151,7 +3151,7 @@ index ae21e0f9..75586936 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f6fb72fa..fad4e929 100644
+index f6fb72fab..fad4e9292 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1300,6 +1300,26 @@ public interface Server extends PluginMessageRecipient {
@@ -3182,7 +3182,7 @@ index f6fb72fa..fad4e929 100644
           * Sends the component to the player
           *
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 247d194f..72c5501e 100644
+index 247d194f8..72c5501e8 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -69,4 +69,12 @@ public interface UnsafeValues {
@@ -3200,7 +3200,7 @@ index 247d194f..72c5501e 100644
  }
 diff --git a/src/main/java/org/bukkit/command/BufferedCommandSender.java b/src/main/java/org/bukkit/command/BufferedCommandSender.java
 new file mode 100644
-index 00000000..f9a00aec
+index 000000000..f9a00aecc
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/BufferedCommandSender.java
 @@ -0,0 +1,21 @@
@@ -3226,7 +3226,7 @@ index 00000000..f9a00aec
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 4bfc2146..03bdc162 100644
+index 4bfc21468..03bdc1622 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -33,7 +33,8 @@ public abstract class Command {
@@ -3256,7 +3256,7 @@ index 4bfc2146..03bdc162 100644
              return true;
          }
 diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
-index d6c8938b..a6ad94ef 100644
+index d6c8938b1..a6ad94ef9 100644
 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 @@ -9,6 +9,7 @@ public class FormattedCommandAlias extends Command {
@@ -3280,7 +3280,7 @@ index d6c8938b..a6ad94ef 100644
      }
 diff --git a/src/main/java/org/bukkit/command/MessageCommandSender.java b/src/main/java/org/bukkit/command/MessageCommandSender.java
 new file mode 100644
-index 00000000..ca1893e9
+index 000000000..ca1893e9f
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/MessageCommandSender.java
 @@ -0,0 +1,114 @@
@@ -3399,7 +3399,7 @@ index 00000000..ca1893e9
 +
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 81e4fa57..f020cb04 100644
+index 81e4fa573..f020cb04e 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 @@ -15,7 +15,6 @@ import org.bukkit.command.defaults.BukkitCommand;
@@ -3456,7 +3456,7 @@ index 81e4fa57..f020cb04 100644
  
 diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 deleted file mode 100644
-index 2a145d85..00000000
+index 2a145d851..000000000
 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 +++ /dev/null
 @@ -1,250 +0,0 @@
@@ -3711,7 +3711,7 @@ index 2a145d85..00000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9b0153f7..9d82a691 100644
+index 9b0153f7d..9d82a691a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1573,6 +1573,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3727,7 +3727,7 @@ index 9b0153f7..9d82a691 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index ec77d7be..c548911c 100644
+index ec77d7be6..c548911c4 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -358,7 +358,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -3787,7 +3787,7 @@ index ec77d7be..c548911c 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index df8a5dcb..50a51394 100644
+index df8a5dcbe..50a51394f 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -53,7 +53,6 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -3830,7 +3830,7 @@ index df8a5dcb..50a51394 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 5830e8b9..36f542a8 100644
+index 5830e8b9b..36f542a85 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -28,7 +28,8 @@ import org.jetbrains.annotations.Nullable;
@@ -3844,7 +3844,7 @@ index 5830e8b9..36f542a8 100644
      private final Map<String, Class<?>> classes = new ConcurrentHashMap<String, Class<?>>();
      private final PluginDescriptionFile description;
 diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java
-index 5ca863b3..612958a3 100644
+index 5ca863b36..612958a33 100644
 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java
 +++ b/src/main/java/org/bukkit/util/CachedServerIcon.java
 @@ -2,6 +2,7 @@ package org.bukkit.util;
@@ -3867,7 +3867,7 @@ index 5ca863b3..612958a3 100644
 +
 +}
 diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java
-index 44badfed..3cbe5c2b 100644
+index 44badfedc..3cbe5c2bb 100644
 --- a/src/main/java/org/spigotmc/CustomTimingsHandler.java
 +++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java
 @@ -1,3 +1,26 @@
@@ -4091,5 +4091,5 @@ index 44badfed..3cbe5c2b 100644
 +
  }
 -- 
-2.26.0
+2.25.1
 

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

@@ -1,11 +1,11 @@
-From 530c3715e2a2fbf308229c1e23d704e8cb3c9c75 Mon Sep 17 00:00:00 2001
+From 8f7d065ee71a514eadcefa97e4c02e5f5e92a106 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 4d9ed678..89dcc9d4 100644
+index 9d82a691a..05b17dce7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1475,6 +1475,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -32,5 +32,5 @@ index 4d9ed678..89dcc9d4 100644
       * Update the list of commands sent to the client.
       * <br>
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0006-Add-getTPS-method.patch

@@ -1,4 +1,4 @@
-From 627f5e579e6923c6f7297db05160264f9dfa66f5 Mon Sep 17 00:00:00 2001
+From 38341660e29303cac1ddb8398e367c30309d0392 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 17:24:57 -0600
 Subject: [PATCH] Add getTPS method
@@ -48,5 +48,5 @@ index fad4e9292..f0dba56dc 100644
       * Get the advancement specified by this key.
       *
 -- 
-2.25.0
+2.25.1
 

Spigot-API-Patches/0007-Entity-Origin-API.patch

@@ -1,11 +1,11 @@
-From 827f8b1953bf6c84be103bcebd58f25914563b5d Mon Sep 17 00:00:00 2001
+From fe1924a542c1c342b0c6d8e83c026b6f608216dc Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 17:50:31 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 6b550dda..4e4445d1 100644
+index 6b550dda2..4e4445d18 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -598,4 +598,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -26,7 +26,7 @@ index 6b550dda..4e4445d1 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
-index 64f9d3fd..14cb0d77 100644
+index 64f9d3fd8..14cb0d770 100644
 --- a/src/main/java/org/bukkit/entity/FallingBlock.java
 +++ b/src/main/java/org/bukkit/entity/FallingBlock.java
 @@ -54,4 +54,15 @@ public interface FallingBlock extends Entity {
@@ -46,7 +46,7 @@ index 64f9d3fd..14cb0d77 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java
-index 5a878932..3022b4a2 100644
+index 5a8789324..3022b4a27 100644
 --- a/src/main/java/org/bukkit/entity/TNTPrimed.java
 +++ b/src/main/java/org/bukkit/entity/TNTPrimed.java
 @@ -39,4 +39,15 @@ public interface TNTPrimed extends Explosive {
@@ -66,5 +66,5 @@ index 5a878932..3022b4a2 100644
 +    }
  }
 -- 
-2.25.0
+2.25.1
 

Spigot-API-Patches/0008-Version-Command-2.0.patch

@@ -1,4 +1,4 @@
-From 4c7cf74d7f8635e4e964d51900bcf71e329526e9 Mon Sep 17 00:00:00 2001
+From eb32e3f7a1965a7b973da5155617dc917201793b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 27 May 2019 01:10:06 -0500
 Subject: [PATCH] Version Command 2.0
@@ -6,7 +6,7 @@ Subject: [PATCH] Version Command 2.0
 
 diff --git a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
 new file mode 100644
-index 00000000..2a265129
+index 000000000..2a2651299
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
 @@ -0,0 +1,44 @@
@@ -55,7 +55,7 @@ index 00000000..2a265129
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 72c5501e..c0ff133d 100644
+index 72c5501e8..c0ff133de 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -76,5 +76,12 @@ public interface UnsafeValues {
@@ -72,7 +72,7 @@ index 72c5501e..c0ff133d 100644
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index cbce5244..0486abd1 100644
+index cbce52444..0486abd19 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 @@ -1,5 +1,6 @@
@@ -176,5 +176,5 @@ index cbce5244..0486abd1 100644
          try {
              BufferedReader reader = Resources.asCharSource(
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch

@@ -1,4 +1,4 @@
-From 0b59e94d724a2181a301a41753de636276177154 Mon Sep 17 00:00:00 2001
+From a986444a1c2cce777677717b45e92227b9c9e192 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Mon, 29 Feb 2016 18:02:25 -0600
 Subject: [PATCH] Add PlayerLocaleChangeEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerLocaleChangeEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java
 new file mode 100644
-index 00000000..29dd763a
+index 000000000..29dd763a9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java
 @@ -0,0 +1,50 @@
@@ -61,5 +61,5 @@ index 00000000..29dd763a
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

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

@@ -1,11 +1,11 @@
-From 2fb8620a338c9f9a94c6af2335a7e02c85d9a98f Mon Sep 17 00:00:00 2001
+From 6db30cd492e9f5db1fcaff253fbe3a4a630af5c6 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 89dcc9d4..195c70d1 100644
+index 05b17dce7..aa64646aa 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1489,6 +1489,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -30,5 +30,5 @@ index 89dcc9d4..195c70d1 100644
  
      /**
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch

@@ -1,4 +1,4 @@
-From d4c36e931e1c6a71cd65d79444a85a29e0ab4bae Mon Sep 17 00:00:00 2001
+From 2aa65d30322969ef1977dfbb7e972747b19e6398 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 18:09:40 -0600
 Subject: [PATCH] Add BeaconEffectEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add BeaconEffectEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
 new file mode 100644
-index 00000000..978813b9
+index 000000000..978813b94
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
 @@ -0,0 +1,86 @@
@@ -97,5 +97,5 @@ index 00000000..978813b9
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch

@@ -1,4 +1,4 @@
-From a29b417ddcedcd6a1c39aa9401f917ebd6e3c6e0 Mon Sep 17 00:00:00 2001
+From 12b172626854e7d81822f669f23778ad946326d2 Mon Sep 17 00:00:00 2001
 From: Steve Anton <anxuiz.nx@gmail.com>
 Date: Mon, 29 Feb 2016 18:13:58 -0600
 Subject: [PATCH] Add PlayerInitialSpawnEvent
@@ -7,7 +7,7 @@ For modifying a player's initial spawn location as they join the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
 new file mode 100644
-index 00000000..8e407eff
+index 000000000..8e407eff1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
 @@ -0,0 +1,47 @@
@@ -59,5 +59,5 @@ index 00000000..8e407eff
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch

@@ -1,11 +1,11 @@
-From 2987610783b80ca353e9c6a6e4e463114c9d85ee Mon Sep 17 00:00:00 2001
+From 62da1f0f47b50b3fc2004268c2da2523d7d5817a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 19:45:21 -0600
 Subject: [PATCH] Automatically disable plugins that fail to load
 
 
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 50a51394..5cc37eee 100644
+index 50a51394f..5cc37eeed 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -344,6 +344,10 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -20,5 +20,5 @@ index 50a51394..5cc37eee 100644
  
              // Perhaps abort here, rather than continue going, but as it stands,
 -- 
-2.25.0
+2.25.1
 

Spigot-API-Patches/0014-Expose-server-CommandMap.patch

@@ -1,4 +1,4 @@
-From b8c5b1d14ba84e8fb7b5dc2dbd7058d46f0a359a Mon Sep 17 00:00:00 2001
+From 5d59f9c5f1e3c3a4121cfe62acf8990497c5f23f Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Mon, 29 Feb 2016 19:48:59 -0600
 Subject: [PATCH] Expose server CommandMap
@@ -49,5 +49,5 @@ index f0dba56dc..af21bb1aa 100644
       * Get the advancement specified by this key.
       *
 -- 
-2.25.0
+2.25.1
 

Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch

@@ -1,4 +1,4 @@
-From 18a481b942f840e9be0a1f0eadae88c7e336a540 Mon Sep 17 00:00:00 2001
+From fa3de2058c1cd982bb8a88560cd9899823522d6a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 19:54:32 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@@ -6,7 +6,7 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
 Change Javadoc to be accurate
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 63e48ef3..b92304e9 100644
+index 6b951d5ad..39423f3a6 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -274,6 +274,26 @@ public final class Bukkit {
@@ -37,7 +37,7 @@ index 63e48ef3..b92304e9 100644
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 87300a5d..d35d2def 100644
+index af21bb1aa..b09d01085 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -225,6 +225,26 @@ public interface Server extends PluginMessageRecipient {
@@ -68,7 +68,7 @@ index 87300a5d..d35d2def 100644
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 195c70d1..5580cdbe 100644
+index aa64646aa..0cb6d2b0a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -442,6 +442,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -111,5 +111,5 @@ index 195c70d1..5580cdbe 100644
       * Forces an update of the player's entire inventory.
       *
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch

@@ -1,4 +1,4 @@
-From 6b39c2b09405e827d4d7d2c774b54651b39efa89 Mon Sep 17 00:00:00 2001
+From f538375cbfe190146ccf1624387062161c0a1e44 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 29 Feb 2016 20:02:40 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -6,7 +6,7 @@ Subject: [PATCH] Player Tab List and Title APIs
 
 diff --git a/src/main/java/com/destroystokyo/paper/Title.java b/src/main/java/com/destroystokyo/paper/Title.java
 new file mode 100644
-index 00000000..4fe18540
+index 000000000..4fe18540f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/Title.java
 @@ -0,0 +1,373 @@
@@ -384,7 +384,7 @@ index 00000000..4fe18540
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5580cdbe..2017a51d 100644
+index 0cb6d2b0a..f0f02c326 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1,6 +1,7 @@
@@ -513,5 +513,5 @@ index 5580cdbe..2017a51d 100644
  
      /**
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0017-Add-exception-reporting-event.patch

@@ -1,4 +1,4 @@
-From d828cc996beb79f80dc5fff118416fe7d87ee90a Mon Sep 17 00:00:00 2001
+From 4510c1ac6e1ad5b0e111a39d9ae63c37bf751b46 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:24:35 -0600
 Subject: [PATCH] Add exception reporting event
@@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
 new file mode 100644
-index 00000000..2f573299
+index 000000000..2f573299a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
 @@ -0,0 +1,43 @@
@@ -55,7 +55,7 @@ index 00000000..2f573299
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
 new file mode 100644
-index 00000000..6fb39af0
+index 000000000..6fb39af04
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
 @@ -0,0 +1,64 @@
@@ -125,7 +125,7 @@ index 00000000..6fb39af0
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
 new file mode 100644
-index 00000000..410b2413
+index 000000000..410b24139
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
 @@ -0,0 +1,52 @@
@@ -183,7 +183,7 @@ index 00000000..410b2413
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerException.java
 new file mode 100644
-index 00000000..c06ea394
+index 000000000..c06ea3942
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerException.java
 @@ -0,0 +1,23 @@
@@ -212,7 +212,7 @@ index 00000000..c06ea394
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
 new file mode 100644
-index 00000000..e762ed0d
+index 000000000..e762ed0db
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
 @@ -0,0 +1,35 @@
@@ -253,7 +253,7 @@ index 00000000..e762ed0d
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
 new file mode 100644
-index 00000000..f016ba3b
+index 000000000..f016ba3b1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
 @@ -0,0 +1,20 @@
@@ -280,7 +280,7 @@ index 00000000..f016ba3b
 \ No newline at end of file
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
 new file mode 100644
-index 00000000..6defac28
+index 000000000..6defac287
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
 @@ -0,0 +1,38 @@
@@ -324,7 +324,7 @@ index 00000000..6defac28
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
 new file mode 100644
-index 00000000..89e13252
+index 000000000..89e132525
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
 @@ -0,0 +1,64 @@
@@ -394,7 +394,7 @@ index 00000000..89e13252
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
 new file mode 100644
-index 00000000..2d0b2d4a
+index 000000000..2d0b2d4a9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
 @@ -0,0 +1,37 @@
@@ -437,7 +437,7 @@ index 00000000..2d0b2d4a
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
 new file mode 100644
-index 00000000..5582999f
+index 000000000..5582999fe
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
 @@ -0,0 +1,22 @@
@@ -464,7 +464,7 @@ index 00000000..5582999f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index f020cb04..adfc7aae 100644
+index f020cb04e..adfc7aae2 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 @@ -8,6 +8,10 @@ import java.util.HashMap;
@@ -506,7 +506,7 @@ index f020cb04..adfc7aae 100644
      }
  
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index c548911c..9a5fe8ca 100644
+index c548911c4..9a5fe8ca4 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -23,6 +23,10 @@ import java.util.WeakHashMap;
@@ -603,5 +603,5 @@ index c548911c..9a5fe8ca 100644
          }
      }
 -- 
-2.26.0
+2.25.1
 

Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch

@@ -1,4 +1,4 @@
-From 709bd509e61a7f25b64fe128b2ae42a5bef797d0 Mon Sep 17 00:00:00 2001
+From d55149dcb67c6bfd3e31d8fbc98345e02abf0175 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 20:26:39 -0600
 Subject: [PATCH] Fix ServerListPingEvent flagging as Async
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix ServerListPingEvent flagging as Async
 This event can sometimes fire Async, set the proper boolean
 
 diff --git a/src/main/java/org/bukkit/event/server/ServerEvent.java b/src/main/java/org/bukkit/event/server/ServerEvent.java
-index 46b11901..05167fb3 100644
+index 46b119017..05167fb34 100644
 --- a/src/main/java/org/bukkit/event/server/ServerEvent.java
 +++ b/src/main/java/org/bukkit/event/server/ServerEvent.java
 @@ -1,5 +1,6 @@
@@ -26,5 +26,5 @@ index 46b11901..05167fb3 100644
  
      public ServerEvent(boolean isAsync) {
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch

@@ -1,11 +1,11 @@
-From 049f07e456fd74dff34a47eef4ffaa10706c8dbf Mon Sep 17 00:00:00 2001
+From 8ae5dc71f1abb6e3a32e468bde32e1783b510380 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 13:05:59 -0800
 Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
 
 
 diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
-index a9020ecc..d3b3a8bf 100644
+index a9020ecc7..d3b3a8bf9 100644
 --- a/src/main/java/org/bukkit/command/CommandSender.java
 +++ b/src/main/java/org/bukkit/command/CommandSender.java
 @@ -61,4 +61,30 @@ public interface CommandSender extends Permissible {
@@ -40,5 +40,5 @@ index a9020ecc..d3b3a8bf 100644
 +    // Paper end
  }
 -- 
-2.25.0
+2.25.1
 

Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -1,4 +1,4 @@
-From ee3d57933edf4cda5071671e3780ad40d12e9157 Mon Sep 17 00:00:00 2001
+From 18d38fdbc6aa79a3105ee7197bfc386a6a46db71 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:47:27 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
@@ -29,5 +29,5 @@ index 203d135f1..52541e496 100644
 +    // Paper end
  }
 -- 
-2.25.0
+2.25.1
 

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

@@ -1,11 +1,11 @@
-From f2621f0d4acb9489a76dea81ddf20287d8351561 Mon Sep 17 00:00:00 2001
+From d6d84e5ecb5b36e7c4ca106801d0926b72f15244 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 f0f02c32..943e6a64 100644
+index f0f02c326..943e6a64e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1225,7 +1225,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -82,7 +82,7 @@ index f0f02c32..943e6a64 100644
      public class Spigot extends Entity.Spigot {
  
 diff --git a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
-index b9819565..4c2102a1 100644
+index b98195650..4c2102a11 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
 @@ -11,13 +11,32 @@ import org.jetbrains.annotations.NotNull;
@@ -119,5 +119,5 @@ index b9819565..4c2102a1 100644
       * Gets the status of this pack.
       *
 -- 
-2.25.0
+2.25.1
 

Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch

@@ -1,4 +1,4 @@
-From 756aea639de4f25d902ce0c2fc794d3d4d1265d3 Mon Sep 17 00:00:00 2001
+From 070befa47c5a599596a610780baaa6cfff261237 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 13:20:33 -0700
 Subject: [PATCH] Use ASM for event executors.
@@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/pom.xml b/pom.xml
-index a540adef..5c25ff12 100644
+index 3cfbff14b..3712b70bc 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -128,6 +128,17 @@
@@ -29,7 +29,7 @@ index a540adef..5c25ff12 100644
      <build>
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 new file mode 100644
-index 00000000..5b28e9b1
+index 000000000..5b28e9b1d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 @@ -0,0 +1,42 @@
@@ -77,7 +77,7 @@ index 00000000..5b28e9b1
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
 new file mode 100644
-index 00000000..c8367242
+index 000000000..c83672427
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
 @@ -0,0 +1,43 @@
@@ -126,7 +126,7 @@ index 00000000..c8367242
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
 new file mode 100644
-index 00000000..b6e7d8ee
+index 000000000..b6e7d8ee8
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
 @@ -0,0 +1,47 @@
@@ -179,7 +179,7 @@ index 00000000..b6e7d8ee
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
 new file mode 100644
-index 00000000..beed9e6e
+index 000000000..beed9e6e0
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
 @@ -0,0 +1,35 @@
@@ -220,7 +220,7 @@ index 00000000..beed9e6e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
 new file mode 100644
-index 00000000..ac99477e
+index 000000000..ac99477e9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
 @@ -0,0 +1,66 @@
@@ -292,7 +292,7 @@ index 00000000..ac99477e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
 new file mode 100644
-index 00000000..72e48e8e
+index 000000000..72e48e8ef
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
 @@ -0,0 +1,35 @@
@@ -332,7 +332,7 @@ index 00000000..72e48e8e
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java
-index a850f078..9026e108 100644
+index a850f0780..9026e108c 100644
 --- a/src/main/java/org/bukkit/plugin/EventExecutor.java
 +++ b/src/main/java/org/bukkit/plugin/EventExecutor.java
 @@ -5,9 +5,75 @@ import org.bukkit.event.EventException;
@@ -412,7 +412,7 @@ index a850f078..9026e108 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 5cc37eee..e72cbde4 100644
+index 5cc37eeed..e72cbde4b 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -300,21 +300,7 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -439,5 +439,5 @@ index 5cc37eee..e72cbde4 100644
                  eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
              } else {
 -- 
-2.25.0
+2.25.1
 

Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch

@@ -1,4 +1,4 @@
-From ac25178018130d824244228559daeb62c031b5c1 Mon Sep 17 00:00:00 2001
+From da27772114ec79eb988549a347bc9b29c2e5e1da Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 19 May 2013 20:36:58 -0400
 Subject: [PATCH] Add a call helper to Event
@@ -6,7 +6,7 @@ Subject: [PATCH] Add a call helper to Event
 Reduces diff in Server patches
 
 diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java
-index 18d0636b..8ec56cd6 100644
+index 18d0636b7..8ec56cd6b 100644
 --- a/src/main/java/org/bukkit/event/Event.java
 +++ b/src/main/java/org/bukkit/event/Event.java
 @@ -35,6 +35,22 @@ public abstract class Event {
@@ -33,5 +33,5 @@ index 18d0636b..8ec56cd6 100644
       * Convenience method for providing a user-friendly identifier. By
       * default, it is the event's class's {@linkplain Class#getSimpleName()
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch

@@ -1,4 +1,4 @@
-From cf697b427b7974f18fcd07174c664d239843ff1f Mon Sep 17 00:00:00 2001
+From c0bad2b238c1d7e452039c10b683dc3075376a4c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 22 Jul 2015 18:50:41 -0400
 Subject: [PATCH] Add sender name to commands.yml replacement
@@ -7,7 +7,7 @@ This allows you to use $sender in commands.yml definitions to make
 commands that auto target self.
 
 diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
-index a6ad94ef..9d4f553c 100644
+index a6ad94ef9..9d4f553c0 100644
 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 @@ -1,6 +1,9 @@
@@ -42,5 +42,5 @@ index a6ad94ef..9d4f553c 100644
          while (index != -1) {
              int start = index;
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch

@@ -1,4 +1,4 @@
-From f00c5126e2cc85c6f326663998ffe6c310531c1f Mon Sep 17 00:00:00 2001
+From f0b316740a9ee295791f79099821d953aa2d11c4 Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:28:07 -0400
 Subject: [PATCH] Add command to reload permissions.yml and require confirm to
@@ -6,7 +6,7 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 39423f3a..423fecf5 100644
+index 39423f3a6..423fecf54 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1574,6 +1574,13 @@ public final class Bukkit {
@@ -24,7 +24,7 @@ index 39423f3a..423fecf5 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b09d0108..38d7da73 100644
+index b09d01085..38d7da737 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1388,4 +1388,6 @@ public interface Server extends PluginMessageRecipient {
@@ -35,7 +35,7 @@ index b09d0108..38d7da73 100644
 +    void reloadPermissions(); // Paper
  }
 diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-index 50cc311b..c62da413 100644
+index 50cc311be..c62da4131 100644
 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
 @@ -13,15 +13,35 @@ public class ReloadCommand extends BukkitCommand {
@@ -85,7 +85,7 @@ index 50cc311b..c62da413 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 9a5fe8ca..8ddaf9c2 100644
+index 9a5fe8ca4..8ddaf9c2e 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -894,4 +894,13 @@ public final class SimplePluginManager implements PluginManager {
@@ -103,5 +103,5 @@ index 9a5fe8ca..8ddaf9c2 100644
 +
  }
 -- 
-2.26.0
+2.25.1
 

Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch

@@ -1,11 +1,11 @@
-From 0f2180289eb27d8af3ad7ec6132eca352efc7ccc Mon Sep 17 00:00:00 2001
+From e9241513c3d597d3dd268f27a6900f94f094c092 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:05:21 -0400
 Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
-index c2793f3e..373f4b5b 100644
+index c2793f3ef..373f4b5b5 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
 @@ -22,6 +22,7 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
@@ -47,5 +47,5 @@ index c2793f3e..373f4b5b 100644
      public boolean isCancelled() {
          return this.isCancelled;
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch

@@ -1,11 +1,11 @@
-From 1ffda222e9676022f70fdf8c7735987051e5ff7c Mon Sep 17 00:00:00 2001
+From 05ae91f7ee31917b7918702d1ebbf81b19243d03 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:44:49 -0400
 Subject: [PATCH] Access items by EquipmentSlot
 
 
 diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java
-index 88ce9dc6..96916ec9 100644
+index 88ce9dc6b..96916ec95 100644
 --- a/src/main/java/org/bukkit/inventory/PlayerInventory.java
 +++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java
 @@ -215,4 +215,23 @@ public interface PlayerInventory extends Inventory {
@@ -33,5 +33,5 @@ index 88ce9dc6..96916ec9 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch

@@ -1,4 +1,4 @@
-From dec02429dc56f84c69c327df0f87b1919f6579a2 Mon Sep 17 00:00:00 2001
+From 7a1354a251ad7d78f0a7f56d94d051e30fcc9a9a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:26:34 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
@@ -6,7 +6,7 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java
 new file mode 100644
-index 00000000..07660202
+index 000000000..07660202e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java
 @@ -0,0 +1,32 @@
@@ -44,7 +44,7 @@ index 00000000..07660202
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java
 new file mode 100644
-index 00000000..e5dbbd66
+index 000000000..e5dbbd660
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java
 @@ -0,0 +1,29 @@
@@ -78,5 +78,5 @@ index 00000000..e5dbbd66
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0029-EntityPathfindEvent.patch

@@ -1,4 +1,4 @@
-From f785fe7ad6eead77bc5103ec2702f4993373e8a9 Mon Sep 17 00:00:00 2001
+From 2ddd503b8812a66fa419df04733b2924fb794a0b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:15:34 -0400
 Subject: [PATCH] EntityPathfindEvent
@@ -7,7 +7,7 @@ Fires when an Entity decides to start moving to a location.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java
 new file mode 100644
-index 00000000..63e46b2f
+index 000000000..63e46b2fb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java
 @@ -0,0 +1,82 @@
@@ -94,5 +94,5 @@ index 00000000..63e46b2f
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch

@@ -1,4 +1,4 @@
-From afee8fb7282413c3d47adc3b5c697f1eb2cf1036 Mon Sep 17 00:00:00 2001
+From dfbeeeb5128994e0561f8b803688603e2e0ea8e3 Mon Sep 17 00:00:00 2001
 From: crast <contact@jamescrasta.com>
 Date: Sat, 1 Jun 2013 13:52:30 -0600
 Subject: [PATCH] Reduce thread synchronization in MetadataStoreBase
@@ -8,7 +8,7 @@ limited synchronized portions to allow much higher concurrency in
 MetadataStore as well as far less locking, especially on reads
 
 diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
-index baf85022..d363d517 100644
+index baf850226..d363d517c 100644
 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
 +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
 @@ -12,7 +12,7 @@ import org.bukkit.plugin.Plugin;
@@ -89,5 +89,5 @@ index baf85022..d363d517 100644
          for (Map<Plugin, MetadataValue> values : metadataMap.values()) {
              if (values.containsKey(owningPlugin)) {
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch

@@ -1,4 +1,4 @@
-From 6ddb428ccd0bcf637ffbd9542cc78facdd1b3e39 Mon Sep 17 00:00:00 2001
+From 091dd579f3b4f7cc79e53b67278eb3fb6a1e6230 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 16 Jul 2013 21:26:50 -0400
 Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin)
@@ -6,7 +6,7 @@ Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin)
 So that on reload, metadata will be cleared
 
 diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
-index d363d517..abbe545a 100644
+index d363d517c..abbe545af 100644
 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
 +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
 @@ -4,6 +4,7 @@ import java.util.ArrayList;
@@ -45,5 +45,5 @@ index d363d517..abbe545a 100644
       * Creates a unique name for the object receiving metadata by combining
       * unique data from the subject with a metadataKey.
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch

@@ -1,4 +1,4 @@
-From 90a091641aad273ceec6d85f70bcc72fa451f316 Mon Sep 17 00:00:00 2001
+From 8ac6eed2974264699f48da9eafb488bc5f9504ab Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:08:36 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerUseUnknownEntityEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java
 new file mode 100644
-index 00000000..09cfdf48
+index 000000000..09cfdf48e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java
 @@ -0,0 +1,46 @@
@@ -57,5 +57,5 @@ index 00000000..09cfdf48
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch

@@ -1,4 +1,4 @@
-From ca75c6d3c7ec62bcb6c2022bd8a2678813c50104 Mon Sep 17 00:00:00 2001
+From f99266e0f58c1e678b0947bb7f8e043464e83591 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:20:18 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@@ -7,7 +7,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
 new file mode 100644
-index 00000000..f0bb4e31
+index 000000000..f0bb4e31c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
 @@ -0,0 +1,222 @@
@@ -234,5 +234,5 @@ index 00000000..f0bb4e31
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch

@@ -1,11 +1,11 @@
-From 9083c64a839306592c6048a3eaf2d47dbe8dd590 Mon Sep 17 00:00:00 2001
+From 9b6b76c82b9ea8b2ac5a9994b7404972c653eb73 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 4 Mar 2016 03:13:18 -0500
 Subject: [PATCH] Arrow pickup rule API
 
 
 diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java
-index 88cebc00..b2bf62a5 100644
+index 88cebc004..b2bf62a50 100644
 --- a/src/main/java/org/bukkit/entity/AbstractArrow.java
 +++ b/src/main/java/org/bukkit/entity/AbstractArrow.java
 @@ -127,4 +127,38 @@ public interface AbstractArrow extends Projectile {
@@ -48,5 +48,5 @@ index 88cebc00..b2bf62a5 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch

@@ -1,11 +1,11 @@
-From 1e799e05cca516707285471789f33d58cba384b7 Mon Sep 17 00:00:00 2001
+From 9ab9b353c9a76455567a474ce06c2916d7789d75 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
-index 8feb6698..d51d2ec1 100644
+index 8feb6698f..d51d2ec1d 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
 @@ -13,12 +13,31 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable
@@ -41,5 +41,5 @@ index 8feb6698..d51d2ec1 100644
      /**
       * Gets the amount of regained health
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0036-LootTable-API.patch

@@ -1,4 +1,4 @@
-From adbfe47db1430abf4f538b0dd7bc4aaebcdbff9a Mon Sep 17 00:00:00 2001
+From f8f1bbee15cabfe54253a4a7e50ee687ebe3694c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 15:19:49 -0400
 Subject: [PATCH] LootTable API
@@ -12,7 +12,7 @@ Provides methods to determine players looted state for an object
 
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
 new file mode 100644
-index 00000000..92d7b853
+index 000000000..92d7b853a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
 @@ -0,0 +1,17 @@
@@ -35,7 +35,7 @@ index 00000000..92d7b853
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
 new file mode 100644
-index 00000000..b387894f
+index 000000000..b387894fe
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
 @@ -0,0 +1,17 @@
@@ -58,7 +58,7 @@ index 00000000..b387894f
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
 new file mode 100644
-index 00000000..97815eeb
+index 000000000..97815eeb2
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
 @@ -0,0 +1,116 @@
@@ -180,7 +180,7 @@ index 00000000..97815eeb
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
 new file mode 100644
-index 00000000..fd184f13
+index 000000000..fd184f13f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
 @@ -0,0 +1,45 @@
@@ -230,7 +230,7 @@ index 00000000..fd184f13
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java
-index c67d7110..a569c7b6 100644
+index c67d71101..a569c7b63 100644
 --- a/src/main/java/org/bukkit/block/Chest.java
 +++ b/src/main/java/org/bukkit/block/Chest.java
 @@ -1,5 +1,7 @@
@@ -251,7 +251,7 @@ index c67d7110..a569c7b6 100644
      /**
       * Gets the inventory of the chest block represented by this block state.
 diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java
-index 74cd194c..07af1a3f 100644
+index 74cd194c9..07af1a3f0 100644
 --- a/src/main/java/org/bukkit/block/Dispenser.java
 +++ b/src/main/java/org/bukkit/block/Dispenser.java
 @@ -1,5 +1,6 @@
@@ -271,7 +271,7 @@ index 74cd194c..07af1a3f 100644
      /**
       * Gets the BlockProjectileSource object for the dispenser.
 diff --git a/src/main/java/org/bukkit/block/Dropper.java b/src/main/java/org/bukkit/block/Dropper.java
-index 424392fb..c7620232 100644
+index 424392fb5..c76202321 100644
 --- a/src/main/java/org/bukkit/block/Dropper.java
 +++ b/src/main/java/org/bukkit/block/Dropper.java
 @@ -1,11 +1,12 @@
@@ -289,7 +289,7 @@ index 424392fb..c7620232 100644
      /**
       * Tries to drop a randomly selected item from the dropper's inventory,
 diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java
-index 58e49309..7ade312f 100644
+index 58e493099..7ade312f1 100644
 --- a/src/main/java/org/bukkit/block/Hopper.java
 +++ b/src/main/java/org/bukkit/block/Hopper.java
 @@ -1,8 +1,9 @@
@@ -304,7 +304,7 @@ index 58e49309..7ade312f 100644
 -public interface Hopper extends Container, Lootable { }
 +public interface Hopper extends Container, LootableBlockInventory { } // Paper
 diff --git a/src/main/java/org/bukkit/block/ShulkerBox.java b/src/main/java/org/bukkit/block/ShulkerBox.java
-index 938f9aea..42f5b4ea 100644
+index 938f9aead..42f5b4ea3 100644
 --- a/src/main/java/org/bukkit/block/ShulkerBox.java
 +++ b/src/main/java/org/bukkit/block/ShulkerBox.java
 @@ -1,5 +1,6 @@
@@ -324,7 +324,7 @@ index 938f9aea..42f5b4ea 100644
      /**
       * Get the {@link DyeColor} corresponding to this ShulkerBox
 diff --git a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
-index 937b99f8..db69687a 100644
+index 937b99f87..db69687a7 100644
 --- a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
 +++ b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
 @@ -1,5 +1,6 @@
@@ -344,7 +344,7 @@ index 937b99f8..db69687a 100644
      /**
       * Checks whether or not this Minecart will pick up
 diff --git a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
-index 9ea403e6..238d118f 100644
+index 9ea403e6f..238d118f7 100644
 --- a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
 +++ b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
 @@ -1,5 +1,6 @@
@@ -362,7 +362,7 @@ index 9ea403e6..238d118f 100644
 +public interface StorageMinecart extends Minecart, InventoryHolder, LootableEntityInventory { // Paper
  }
 diff --git a/src/main/java/org/bukkit/loot/Lootable.java b/src/main/java/org/bukkit/loot/Lootable.java
-index 24a3d989..901db852 100644
+index 24a3d989d..901db8524 100644
 --- a/src/main/java/org/bukkit/loot/Lootable.java
 +++ b/src/main/java/org/bukkit/loot/Lootable.java
 @@ -36,6 +36,34 @@ public interface Lootable {
@@ -401,5 +401,5 @@ index 24a3d989..901db852 100644
       * Set the seed used when this Loot Table generates loot.
       *
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0037-Add-EntityZapEvent.patch

@@ -1,4 +1,4 @@
-From 8c1752d4801781454495bf4d0eb5554cc270538f Mon Sep 17 00:00:00 2001
+From 3e509ef8019f3efe28e265dbbbdae31c3f23d235 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:34 -0700
 Subject: [PATCH] Add EntityZapEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityZapEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
 new file mode 100644
-index 00000000..3b725a48
+index 000000000..3b725a489
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
 @@ -0,0 +1,65 @@
@@ -76,7 +76,7 @@ index 00000000..3b725a48
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-index 0e0ed93b..d3949edf 100644
+index 0e0ed93b5..d3949edfc 100644
 --- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
 @@ -2,6 +2,7 @@ package org.bukkit.event.entity;
@@ -122,5 +122,5 @@ index 0e0ed93b..d3949edf 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0038-Misc-Utils.patch

@@ -1,4 +1,4 @@
-From 952aa5667bd48ddb71a0b357b7ae97622d964320 Mon Sep 17 00:00:00 2001
+From 559959380fa34db1acd3b167e05bafb17b89e8f4 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 12:53:43 -0500
 Subject: [PATCH] Misc Utils
@@ -6,7 +6,7 @@ Subject: [PATCH] Misc Utils
 
 diff --git a/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java b/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java
 new file mode 100644
-index 00000000..5bb677ce
+index 000000000..5bb677ce5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java
 @@ -0,0 +1,34 @@
@@ -45,5 +45,5 @@ index 00000000..5bb677ce
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch

@@ -1,4 +1,4 @@
-From b603b131d3e8a465c227a072486f9121832fa5f0 Mon Sep 17 00:00:00 2001
+From c841a774495970964d668cc65c0715e84f43e951 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:16:39 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -99,5 +99,5 @@ index c62da4131..af8ab73fe 100644
                  confirmed = true;
              } else {
 -- 
-2.25.0
+2.25.1
 

Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch

@@ -1,11 +1,11 @@
-From 64007b93caf3708274585172c66edb0e11d04b24 Mon Sep 17 00:00:00 2001
+From d021eefa33645c6ad7cb1bf140a9f7602ccc6704 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:47:08 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
-index c99c9281..7c340f53 100644
+index c99c9281e..7c340f539 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
 @@ -1,21 +1,43 @@
@@ -53,5 +53,5 @@ index c99c9281..7c340f53 100644
       * Get the amount of experience the player will receive
       *
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch

@@ -1,4 +1,4 @@
-From a7ee9a6f5fc22809be5c20ec306953af7b49c522 Mon Sep 17 00:00:00 2001
+From 09ab884e22c0b5d6b658c1fb2b9f98b711cd2b7d Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add ProjectileCollideEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
 new file mode 100644
-index 00000000..45366389
+index 000000000..453663893
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
 @@ -0,0 +1,67 @@
@@ -78,5 +78,5 @@ index 00000000..45366389
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

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

@@ -1,11 +1,11 @@
-From 6e5d036ae3b3f7115a03dba6e5cb6350a87c49d3 Mon Sep 17 00:00:00 2001
+From 20f3a9e73351f0d7b3366eab311eb467d1247a25 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 943e6a64..58a6795d 100644
+index 943e6a64e..58a6795df 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
@@ -72,5 +72,5 @@ index 943e6a64..58a6795d 100644
              throw new UnsupportedOperationException("Not supported yet.");
          }
 -- 
-2.25.0
+2.25.1
 

Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch

@@ -1,11 +1,11 @@
-From 513f6bcf5563fb3d9fd1401cd1a62f4f24c33a2c Mon Sep 17 00:00:00 2001
+From 16cad21ec53a8899e2579841f235ee51c62052ce Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index beeba55d..6a854d7c 100644
+index beeba55d5..6a854d7cf 100644
 --- a/src/main/java/org/bukkit/entity/ArmorStand.java
 +++ b/src/main/java/org/bukkit/entity/ArmorStand.java
 @@ -291,4 +291,22 @@ public interface ArmorStand extends LivingEntity {
@@ -32,5 +32,5 @@ index beeba55d..6a854d7c 100644
 +    // Paper end
  }
 -- 
-2.25.0
+2.25.1
 

Spigot-API-Patches/0044-IllegalPacketEvent.patch

@@ -1,4 +1,4 @@
-From e9e0b9f25fba2df081017bb48db56bfa40e364f6 Mon Sep 17 00:00:00 2001
+From 95814d0fc19ff644b9d7c04a93a16ec96b3c5b6a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 4 Dec 2016 01:19:14 -0500
 Subject: [PATCH] IllegalPacketEvent
@@ -9,7 +9,7 @@ Lets plugins change the kick message and if it should kick or not.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java
 new file mode 100644
-index 00000000..37a17f0b
+index 000000000..37a17f0bb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java
 @@ -0,0 +1,70 @@
@@ -84,5 +84,5 @@ index 00000000..37a17f0b
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0045-Fireworks-API-s.patch

@@ -1,4 +1,4 @@
-From 5350778e510bb69d70efd8d83fb58caf1cdf8fd9 Mon Sep 17 00:00:00 2001
+From 98d25e5120b1967d9983edeb20d952bb16104c87 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:55 -0500
 Subject: [PATCH] Fireworks API's
@@ -7,7 +7,7 @@ Get the Entity being boosted
 Get the firework launcher
 
 diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java
-index f844d5aa..e8c04c13 100644
+index f844d5aa9..e8c04c138 100644
 --- a/src/main/java/org/bukkit/entity/Firework.java
 +++ b/src/main/java/org/bukkit/entity/Firework.java
 @@ -3,6 +3,9 @@ package org.bukkit.entity;
@@ -37,5 +37,5 @@ index f844d5aa..e8c04c13 100644
 +    // Paper end
  }
 -- 
-2.14.1.windows.1
+2.25.1
 

Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch

@@ -1,4 +1,4 @@
-From 3bcf7bff9c9f71c3122f392b2c723f7a046c43bb Mon Sep 17 00:00:00 2001
+From 0e0e72ef0da87fb3a9de37e049181261b1563ade Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 20:29:33 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@@ -7,7 +7,7 @@ Allows you to access the Gateway being used in a teleport event
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java
 new file mode 100644
-index 00000000..b64ab6ee
+index 000000000..b64ab6eec
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java
 @@ -0,0 +1,29 @@
@@ -41,5 +41,5 @@ index 00000000..b64ab6ee
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch

@@ -1,4 +1,4 @@
-From fe0318389beb2088daeccc0b47ab87418d56bdec Mon Sep 17 00:00:00 2001
+From df2cbfd4b45e1d99861b99775717e8bb65521555 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:23:03 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index cd8a0957..808c3b4a 100644
+index cd8a09576..808c3b4a4 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -40,6 +40,33 @@ import org.jetbrains.annotations.Nullable;
@@ -45,5 +45,5 @@ index cd8a0957..808c3b4a 100644
       * Gets the {@link Block} at the given coordinates
       *
 -- 
-2.26.0
+2.25.1
 

Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch

@@ -1,4 +1,4 @@
-From 55be87884e78cf987c5f047e44e15d509fcc1fc5 Mon Sep 17 00:00:00 2001
+From a4e43288167984c868f8d3c62aab633fb1f8ae78 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:28:32 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
 Replaces isFromBottle() with logic that persists entity reloads too.
 
 diff --git a/src/main/java/org/bukkit/entity/ExperienceOrb.java b/src/main/java/org/bukkit/entity/ExperienceOrb.java
-index c286edfd..dec70bbf 100644
+index c286edfd8..dec70bbfa 100644
 --- a/src/main/java/org/bukkit/entity/ExperienceOrb.java
 +++ b/src/main/java/org/bukkit/entity/ExperienceOrb.java
 @@ -1,5 +1,8 @@
@@ -121,5 +121,5 @@ index c286edfd..dec70bbf 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch

@@ -1,11 +1,11 @@
-From 0514c1bc80be7336de8681a0bd9e594894c51a1e Mon Sep 17 00:00:00 2001
+From 8eb2d55c1b5aa53889b24064e59c13684dc9d0e9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 21 Jan 2017 17:03:10 -0600
 Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check
 
 
 diff --git a/src/main/java/org/bukkit/WorldBorder.java b/src/main/java/org/bukkit/WorldBorder.java
-index 7e8f5649..afb7b136 100644
+index 7e8f5649c..afb7b136b 100644
 --- a/src/main/java/org/bukkit/WorldBorder.java
 +++ b/src/main/java/org/bukkit/WorldBorder.java
 @@ -117,4 +117,18 @@ public interface WorldBorder {
@@ -28,5 +28,5 @@ index 7e8f5649..afb7b136 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch

@@ -1,4 +1,4 @@
-From 955026063b2174e79c657fa323591c79101d1cf8 Mon Sep 17 00:00:00 2001
+From 57dfe41e0fe5f7f191d659a8f17525d507024ec0 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:24 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@@ -58,5 +58,5 @@ index 7f153000e..1e126487d 100644
          }
          return completions;
 -- 
-2.25.0
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From 6f09bf71699cd554a8891cb9f0d72f4a290dcc9f Mon Sep 17 00:00:00 2001
+From 2c5ef53e6bd05c58c28fd9322634a48da97c292a 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 808c3b4a..3b027f67 100644
+index 808c3b4a4..3b027f67c 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -2009,6 +2009,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -74,7 +74,7 @@ index 808c3b4a..3b027f67 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 c2096b53..bca9d365 100644
+index c2096b534..bca9d3659 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 c2096b53..bca9d365 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 58a6795d..f10ef7ae 100644
+index 58a6795df..f10ef7ae7 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
@@ -179,7 +179,7 @@ index 58a6795d..f10ef7ae 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 1b2267f4..1a58734d 100644
+index 1b2267f4e..1a58734d9 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 1b2267f4..1a58734d 100644
          return to;
      }
 -- 
-2.26.0
+2.25.1
 

Spigot-API-Patches/0052-Item-canEntityPickup.patch

@@ -1,11 +1,11 @@
-From d71df227a9f6de7d4a3fd1f0345b8f561c3c3bb1 Mon Sep 17 00:00:00 2001
+From e577358b94c9b069218f40f2eea0b5156b524549 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 May 2017 03:57:08 -0500
 Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index 00c58c1d..cb9e9f36 100644
+index 00c58c1d9..cb9e9f369 100644
 --- a/src/main/java/org/bukkit/entity/Item.java
 +++ b/src/main/java/org/bukkit/entity/Item.java
 @@ -37,4 +37,20 @@ public interface Item extends Entity {
@@ -30,5 +30,5 @@ index 00c58c1d..cb9e9f36 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch

@@ -1,11 +1,11 @@
-From ac6c730b5828a6f3afdfd5b74cfff7dc5ffb87af Mon Sep 17 00:00:00 2001
+From 2f6600df7fdfa7b4d7a3110475814d2c2d72d27f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 May 2017 06:26:01 -0500
 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
-index 951ea2cc..18d82c11 100644
+index 951ea2cc7..18d82c111 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
 @@ -17,6 +17,7 @@ import org.jetbrains.annotations.NotNull;
@@ -53,5 +53,5 @@ index 951ea2cc..18d82c11 100644
  
      @NotNull
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch

@@ -1,4 +1,4 @@
-From b8556b9570db71c4791eb5ec64ecd258d48e9737 Mon Sep 17 00:00:00 2001
+From f5f3d8868eddd5a287febdd2f4ce1d62eac6122e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 11 Jun 2017 16:30:37 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerAttemptPickupItemEvent
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java
 new file mode 100644
-index 00000000..fb5cb3dc
+index 000000000..fb5cb3dc4
 --- /dev/null
 +++ b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java
 @@ -0,0 +1,89 @@
@@ -100,5 +100,5 @@ index 00000000..fb5cb3dc
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch

@@ -1,4 +1,4 @@
-From 7d8324440f38691b133a6173eec32ffff6764533 Mon Sep 17 00:00:00 2001
+From c9b7dd5b35264329e3f69140fb8845e44bd1b251 Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:06 -0400
 Subject: [PATCH] Add UnknownCommandEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add UnknownCommandEvent
 
 diff --git a/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
 new file mode 100644
-index 00000000..251342c3
+index 000000000..251342c3c
 --- /dev/null
 +++ b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
 @@ -0,0 +1,82 @@
@@ -93,5 +93,5 @@ index 00000000..251342c3
 +}
 +
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch

@@ -1,4 +1,4 @@
-From 1713c641bba9f7f2a2a9f8e15d3c3460b63c75e9 Mon Sep 17 00:00:00 2001
+From ce40c2ae5ef2185bbe92984163dd404087d6141d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 15 Jan 2018 21:46:46 -0500
 Subject: [PATCH] Basic PlayerProfile API
@@ -318,5 +318,5 @@ index 112098f9b..6778ac8e5 100644
      // Paper end
  }
 -- 
-2.25.0
+2.25.1
 

Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch

@@ -1,11 +1,11 @@
-From 9d1fc09e269f884e5740bfc253532f11c0e26d79 Mon Sep 17 00:00:00 2001
+From 0a6bf8a64b4096498da9a4846ec9cc81c7075f4e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:04:51 -0400
 Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 6277f392..5b5fb303 100644
+index 6277f3928..5b5fb3034 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -324,6 +324,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
@@ -36,5 +36,5 @@ index 6277f392..5b5fb303 100644
       * Discover a recipe for this player such that it has not already been
       * discovered. This method will add the key's associated recipe to the
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0058-Profile-Lookup-Events.patch

@@ -1,4 +1,4 @@
-From 0ae5d7576d18a61f327e7ebb939a3cb9aa79f7d4 Mon Sep 17 00:00:00 2001
+From ee60b16c81cd7ad8564d94a908c93eae2263973e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 16:30:44 -0400
 Subject: [PATCH] Profile Lookup Events
@@ -8,7 +8,7 @@ profiles that had to be looked up.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java
 new file mode 100644
-index 00000000..8df37c07
+index 000000000..8df37c07c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java
 @@ -0,0 +1,46 @@
@@ -60,7 +60,7 @@ index 00000000..8df37c07
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java
 new file mode 100644
-index 00000000..4dcf6242
+index 000000000..4dcf6242c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java
 @@ -0,0 +1,108 @@
@@ -173,5 +173,5 @@ index 00000000..4dcf6242
 +
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0059-Entity-fromMobSpawner.patch

@@ -1,11 +1,11 @@
-From 5c5b505bed7e25ccca0603f053eb434501af7f47 Mon Sep 17 00:00:00 2001
+From cf40a09c3aafc120d4653b62ade05c18cf6574f6 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 4e4445d1..e2952209 100644
+index 4e4445d18..e2952209d 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -609,5 +609,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -22,5 +22,5 @@ index 4e4445d1..e2952209 100644
      // Paper end
  }
 -- 
-2.25.0
+2.25.1
 

Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch

@@ -1,4 +1,4 @@
-From 72e4471858378ddc591e391d2aae62c1937fb07d Mon Sep 17 00:00:00 2001
+From 550cd3e16b4c171704291fe55100ff9e3cdba55e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Dec 2016 16:12:48 -0500
 Subject: [PATCH] Improve the Saddle API for Horses
@@ -8,7 +8,7 @@ and access their saddle state separately from an interface shared with Armor.
 
 diff --git a/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java b/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java
 new file mode 100644
-index 00000000..163ffe8f
+index 000000000..163ffe8ff
 --- /dev/null
 +++ b/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java
 @@ -0,0 +1,21 @@
@@ -34,7 +34,7 @@ index 00000000..163ffe8f
 +    void setArmor(@Nullable ItemStack stack);
 +}
 diff --git a/src/main/java/org/bukkit/inventory/HorseInventory.java b/src/main/java/org/bukkit/inventory/HorseInventory.java
-index 608e99c4..53498deb 100644
+index 608e99c42..53498debe 100644
 --- a/src/main/java/org/bukkit/inventory/HorseInventory.java
 +++ b/src/main/java/org/bukkit/inventory/HorseInventory.java
 @@ -5,20 +5,4 @@ import org.jetbrains.annotations.Nullable;
@@ -60,7 +60,7 @@ index 608e99c4..53498deb 100644
 -}
 +public interface HorseInventory extends AbstractHorseInventory, ArmoredHorseInventory {}
 diff --git a/src/main/java/org/bukkit/inventory/LlamaInventory.java b/src/main/java/org/bukkit/inventory/LlamaInventory.java
-index 2fa2c9d0..5ac1afb8 100644
+index 2fa2c9d07..5ac1afb8a 100644
 --- a/src/main/java/org/bukkit/inventory/LlamaInventory.java
 +++ b/src/main/java/org/bukkit/inventory/LlamaInventory.java
 @@ -6,7 +6,7 @@ import org.jetbrains.annotations.Nullable;
@@ -74,7 +74,7 @@ index 2fa2c9d0..5ac1afb8 100644
       * Gets the item in the llama's decor slot.
 diff --git a/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java b/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java
 new file mode 100644
-index 00000000..7944f26a
+index 000000000..7944f26a3
 --- /dev/null
 +++ b/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java
 @@ -0,0 +1,3 @@
@@ -82,5 +82,5 @@ index 00000000..7944f26a
 +
 +public interface SaddledHorseInventory extends AbstractHorseInventory {}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0061-ensureServerConversions-API.patch

@@ -1,4 +1,4 @@
-From 246d7a5d7608b26b9749a52b8d2bd16dc34c0aa5 Mon Sep 17 00:00:00 2001
+From ea049a06b4c2090fbf19ac3bf86bf2bc4662f49e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:55:48 -0400
 Subject: [PATCH] ensureServerConversions API
@@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 to ensure it meets latest minecraft expectations.
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 4ff149fd..bb3f7cdc 100644
+index 4ff149fd9..bb3f7cdc1 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -141,4 +141,17 @@ public interface ItemFactory {
@@ -29,7 +29,7 @@ index 4ff149fd..bb3f7cdc 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 180c292f..ca6d1233 100644
+index f70a6a22b..07aa65d1a 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -536,7 +536,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -62,5 +62,5 @@ index 180c292f..ca6d1233 100644
 +    // Paper end
  }
 -- 
-2.25.0
+2.25.1
 

Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch

@@ -1,4 +1,4 @@
-From 3f4a17835ea5512030e329f447171e75323f9bf9 Mon Sep 17 00:00:00 2001
+From 50e776a94f7520476e8899ecd8573b261c0fc06e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:55:48 -0400
 Subject: [PATCH] Add getI18NDisplayName API
@@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
 You must replace the language file embedded in the server jar.
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index bb3f7cdc..3cada348 100644
+index bb3f7cdc1..3cada3487 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -153,5 +153,16 @@ public interface ItemFactory {
@@ -29,7 +29,7 @@ index bb3f7cdc..3cada348 100644
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index ca6d1233..8adf9399 100644
+index 07aa65d1a..e9ba31152 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -609,5 +609,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -51,5 +51,5 @@ index ca6d1233..8adf9399 100644
      // Paper end
  }
 -- 
-2.25.0
+2.25.1
 

Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch

@@ -1,4 +1,4 @@
-From 99c1ecbc8bb08b1102844c2e06aff75e8e189876 Mon Sep 17 00:00:00 2001
+From 60fe06db929a635f93e050456fa5e2e0800592c2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:34 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
@@ -9,7 +9,7 @@ Allows you to do dynamic whitelisting and change of kick message
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
 new file mode 100644
-index 00000000..b1017628
+index 000000000..b10176289
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
 @@ -0,0 +1,117 @@
@@ -131,5 +131,5 @@ index 00000000..b1017628
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch

@@ -1,11 +1,11 @@
-From eab6fa45fa7d9eddd35d65024ec8e8b2e89d3088 Mon Sep 17 00:00:00 2001
+From 2f10a17ee8ab17bebd10793c17d178d6800a973e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 02:08:55 -0500
 Subject: [PATCH] Make /plugins list alphabetical
 
 
 diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
-index bcb576a4..a1071e31 100644
+index bcb576a42..a1071e317 100644
 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
 @@ -3,6 +3,9 @@ package org.bukkit.command.defaults;
@@ -58,5 +58,5 @@ index bcb576a4..a1071e31 100644
      }
  }
 -- 
-2.26.0
+2.25.1
 

Spigot-API-Patches/0065-LivingEntity-setKiller.patch

@@ -1,4 +1,4 @@
-From c7c6e0f77754ecb3b0a30e5f64b9003bfb66a76c Mon Sep 17 00:00:00 2001
+From 238ffac36922679c18effa5dc57ec213734e14a5 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:43 -0500
 Subject: [PATCH] LivingEntity#setKiller
@@ -25,5 +25,5 @@ index 52541e496..ae712e76d 100644
       * Adds the given {@link PotionEffect} to the living entity.
       *
 -- 
-2.25.0
+2.25.1
 

Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch

@@ -1,4 +1,4 @@
-From d5fd96d447dd6f8d8fa433d18082329fea603982 Mon Sep 17 00:00:00 2001
+From 34676ba4f3ae9ae7934cf80a78b2230f43d24941 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:14:13 +0200
 Subject: [PATCH] Handle plugin prefixes in implementation logging
@@ -17,7 +17,7 @@ The implementation should handle plugin prefixes by displaying
 logger names when appropriate.
 
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index 22319005..bb2e55e9 100644
+index 223190054..bb2e55e97 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 {
@@ -40,5 +40,5 @@ index 22319005..bb2e55e9 100644
  
      /**
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -1,4 +1,4 @@
-From 349a9bf5d5d38cd62f2ed1df7e6524cb9900c6e2 Mon Sep 17 00:00:00 2001
+From ffef7f82e6a112395460bed64907a045656d685a Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:12 +0200
 Subject: [PATCH] Allow plugins to use SLF4J for logging
@@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.
 
 diff --git a/pom.xml b/pom.xml
-index 5c25ff12..a71015f4 100644
+index 3712b70bc..2cb971408 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -109,6 +109,13 @@
@@ -32,7 +32,7 @@ index 5c25ff12..a71015f4 100644
          <dependency>
              <groupId>junit</groupId>
 diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java
-index febfec6e..79890c68 100644
+index febfec6ef..79890c68f 100644
 --- a/src/main/java/org/bukkit/plugin/Plugin.java
 +++ b/src/main/java/org/bukkit/plugin/Plugin.java
 @@ -166,6 +166,13 @@ public interface Plugin extends TabExecutor {
@@ -50,5 +50,5 @@ index febfec6e..79890c68 100644
       * Returns the name of the plugin.
       * <p>
 -- 
-2.25.0.windows.1
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From c8c8741ee68669f675d4cb4dc5abc430d289bcf1 Mon Sep 17 00:00:00 2001
+From 470028a790e67685c105a18098263915ec876864 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 00000000..76f2cb9c
+index 000000000..76f2cb9cd
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java
 @@ -0,0 +1,41 @@
@@ -60,7 +60,7 @@ index 00000000..76f2cb9c
 +
 +}
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index bb2e55e9..04fa3991 100644
+index bb2e55e97..04fa3991f 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,7 +87,7 @@ index bb2e55e9..04fa3991 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 36f542a8..3a02dbe9 100644
+index 36f542a85..3a02dbe9d 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -42,6 +42,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -116,5 +116,5 @@ index 36f542a8..3a02dbe9 100644
      }
  }
 -- 
-2.25.0
+2.25.1
 

Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch

@@ -1,4 +1,4 @@
-From 391c8c2ec698ac64a495038842cbb2228c92e4bc Mon Sep 17 00:00:00 2001
+From c4ca332d0ca8e7faf24ebde6d024bfd7af31c49c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Sep 2017 17:21:32 -0400
 Subject: [PATCH] Add PlayerJumpEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerJumpEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java
 new file mode 100644
-index 00000000..289a0d78
+index 000000000..289a0d784
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java
 @@ -0,0 +1,106 @@
@@ -117,5 +117,5 @@ index 00000000..289a0d78
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch

@@ -1,4 +1,4 @@
-From acb615089a33d457c84bce216ba87649efe7e50d Mon Sep 17 00:00:00 2001
+From b59461723c656710c7e6ae295ab42941d8c2e1df Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:44:42 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -11,7 +11,7 @@ Add a NetworkClient interface that provides access to:
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/NetworkClient.java b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
 new file mode 100644
-index 00000000..7b2af1bd
+index 000000000..7b2af1bd7
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
 @@ -0,0 +1,41 @@
@@ -57,7 +57,7 @@ index 00000000..7b2af1bd
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index da36c8df..dbe53123 100644
+index f10ef7ae7..a0590f369 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable;
@@ -70,5 +70,5 @@ index da36c8df..dbe53123 100644
      /**
       * Gets the "friendly" name to display of this player. This may include
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch

@@ -1,4 +1,4 @@
-From 119d214a5cf12953f1d00e283e2c5768be6d9d03 Mon Sep 17 00:00:00 2001
+From 3c8d83a02f90cdcadab5ab2b4caa858424ae992f Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:45:59 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java
 new file mode 100644
-index 00000000..2827a100
+index 000000000..2827a1002
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java
 @@ -0,0 +1,137 @@
@@ -148,5 +148,5 @@ index 00000000..2827a100
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch

@@ -1,4 +1,4 @@
-From aab556b666c1f5b415f1bd6fd6f3598964819f4e Mon Sep 17 00:00:00 2001
+From d6f2a708c9cb4611c6f9fe506432e7a3968192f1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 6 Nov 2017 21:10:01 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot
@@ -9,7 +9,7 @@ on the real tile entity.
 This is useful for where performance is needed
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index ab6750c7..af4ffada 100644
+index ab6750c7a..af4ffada0 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -268,6 +268,16 @@ public interface Block extends Metadatable {
@@ -30,5 +30,5 @@ index ab6750c7..af4ffada 100644
       * Returns the biome that this block resides in
       *
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch

@@ -1,4 +1,4 @@
-From 0cf763fb20fce10342ebec0cbcfa200d8b8a7a5b Mon Sep 17 00:00:00 2001
+From fadca523e626b46d425dc49ec7a52379c7ab963d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:17:09 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@@ -13,7 +13,7 @@ completion, such as offline players.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
 new file mode 100644
-index 00000000..619ed371
+index 000000000..619ed3716
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
 @@ -0,0 +1,177 @@
@@ -195,7 +195,7 @@ index 00000000..619ed371
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
-index d1a9956a..f96c4ba5 100644
+index d1a9956a1..f96c4ba53 100644
 --- a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
 +++ b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
 @@ -1,5 +1,6 @@
@@ -265,5 +265,5 @@ index d1a9956a..f96c4ba5 100644
  
      @Override
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch

@@ -1,4 +1,4 @@
-From e2ace04b7cc11c54b3a492d9a95a492b6aad8881 Mon Sep 17 00:00:00 2001
+From a05418027d1bbb6f2adaeef7fa06c19b2f9ca0fd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 9 Dec 2017 12:40:25 -0500
 Subject: [PATCH] Display warning on deprecated recipe API
@@ -10,7 +10,7 @@ on the players login.
 Plugin authors need to define a key to keep it consistent between server restarts.
 
 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index d74b3114..d742c405 100644
+index d74b3114f..d742c4058 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 @@ -25,6 +25,7 @@ public class ShapedRecipe implements Recipe, Keyed {
@@ -22,7 +22,7 @@ index d74b3114..d742c405 100644
      }
  
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index 68447fb8..84062dd7 100644
+index 68447fb8c..84062dd71 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 @@ -26,6 +26,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
@@ -34,5 +34,5 @@ index 68447fb8..84062dd7 100644
      }
  
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch

@@ -1,4 +1,4 @@
-From 76a536dbdb61eb6fde0d55df507f92deb21e6a31 Mon Sep 17 00:00:00 2001
+From 71071c945004982e39bd9f02ca5dd1183b1f37e0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:00:41 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
@@ -7,7 +7,7 @@ Allows plugins to cancel a player picking up an experience orb
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java
 new file mode 100644
-index 00000000..f7beb22d
+index 000000000..f7beb22d5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java
 @@ -0,0 +1,80 @@
@@ -92,5 +92,5 @@ index 00000000..f7beb22d
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch

@@ -1,4 +1,4 @@
-From 72c291be9d0bb7daaf28bba76ff4968f10eb05df Mon Sep 17 00:00:00 2001
+From 8ff1280282b3c67e3fb94958a9a9c4f4d6410faa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:56:24 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
@@ -9,7 +9,7 @@ metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java
 new file mode 100644
-index 00000000..0ce3e397
+index 000000000..0ce3e3977
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java
 @@ -0,0 +1,87 @@
@@ -101,5 +101,5 @@ index 00000000..0ce3e397
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From af375fcae65a50a414f7c3b33c75d90d43edf6a9 Mon Sep 17 00:00:00 2001
+From 704a8eb995dad4c5e12beae1782d462c021b1ce9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:38:07 -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/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index dbe53123..420aa906 100644
+index a0590f369..088430a45 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -934,12 +934,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -49,5 +49,5 @@ index dbe53123..420aa906 100644
      /**
       * Gives the player the amount of experience levels specified. Levels can
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch

@@ -1,4 +1,4 @@
-From a532d8b8494cbfe850034f92ca644fc5f566c4fc Mon Sep 17 00:00:00 2001
+From 51c2512ba9f95dbfd65b88b9fe21d56bde914c32 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 16:59:43 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
@@ -16,7 +16,7 @@ See: https://github.com/PaperMC/Paper/issues/917
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java
 new file mode 100644
-index 00000000..d5edde9c
+index 000000000..d5edde9cd
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java
 @@ -0,0 +1,104 @@
@@ -125,5 +125,5 @@ index 00000000..d5edde9c
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch

@@ -1,4 +1,4 @@
-From 8bb61dab0ecdcf6e35175d10d9d2f8a003505894 Mon Sep 17 00:00:00 2001
+From a33bd8275812e8768a043bc3f267fbf8ac6db744 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:31:37 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
@@ -10,7 +10,7 @@ Also a highly more effecient way to blanket block spawns in a world
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java
 new file mode 100644
-index 00000000..112a0dbf
+index 000000000..112a0dbf5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java
 @@ -0,0 +1,64 @@
@@ -79,5 +79,5 @@ index 00000000..112a0dbf
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch

@@ -1,4 +1,4 @@
-From cbdb821df0d1d148d04aeda9d0f83199e90c6f72 Mon Sep 17 00:00:00 2001
+From 9a1ede056ec1aba4f009706f545751ab7a6d40d5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Jan 2018 00:29:28 -0500
 Subject: [PATCH] Add setPlayerProfile API for Skulls
@@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo
 which commonly cause rate limit issues with Mojang API
 
 diff --git a/src/main/java/org/bukkit/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java
-index 943d751f..a6914f01 100644
+index 943d751fb..a6914f01e 100644
 --- a/src/main/java/org/bukkit/block/Skull.java
 +++ b/src/main/java/org/bukkit/block/Skull.java
 @@ -7,6 +7,7 @@ import org.bukkit.block.data.BlockData;
@@ -40,7 +40,7 @@ index 943d751f..a6914f01 100644
       * Gets the rotation of the skull in the world (or facing direction if this
       * is a wall mounted skull).
 diff --git a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
-index 35a39203..8b2465ea 100644
+index 35a392033..8b2465ea2 100644
 --- a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
 @@ -1,9 +1,11 @@
@@ -77,5 +77,5 @@ index 35a39203..8b2465ea 100644
       * Gets the owner of the skull.
       *
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch

@@ -1,4 +1,4 @@
-From 49361ac9699332af1561efa4ef6e66a17aede152 Mon Sep 17 00:00:00 2001
+From a9c4c45122619d2ce3561c256614f4c81b893309 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 2 Jan 2018 00:31:08 -0500
 Subject: [PATCH] Fill Profile Property Events
@@ -12,7 +12,7 @@ This is useful for implementing a ProfileCache for Player Skulls
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java
 new file mode 100644
-index 00000000..71f36e9c
+index 000000000..71f36e9ca
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java
 @@ -0,0 +1,75 @@
@@ -93,7 +93,7 @@ index 00000000..71f36e9c
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java
 new file mode 100644
-index 00000000..021bc863
+index 000000000..021bc8631
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java
 @@ -0,0 +1,77 @@
@@ -175,5 +175,5 @@ index 00000000..021bc863
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch

@@ -1,4 +1,4 @@
-From be3e65856f9a9b498ac9a1e8b9427d57e533af6d Mon Sep 17 00:00:00 2001
+From 16e6184f6baaa78ed043b38ab35a19ddbd296c21 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Jan 2018 08:15:14 -0600
 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java
 new file mode 100644
-index 00000000..bb8d7c95
+index 000000000..bb8d7c959
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java
 @@ -0,0 +1,63 @@
@@ -74,5 +74,5 @@ index 00000000..bb8d7c95
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch

@@ -1,4 +1,4 @@
-From 71ae7aea9324a132adf65042528ec5b02fe13c55 Mon Sep 17 00:00:00 2001
+From a5fc188f4ae9a73cf2c391bbf684aba1220eb83d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:06:24 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
@@ -12,7 +12,7 @@ starting point for future additions in this area.
 
 diff --git a/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java
 new file mode 100644
-index 00000000..7e4acfff
+index 000000000..7e4acfff1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java
 @@ -0,0 +1,78 @@
@@ -95,5 +95,5 @@ index 00000000..7e4acfff
 +    void setMarker(boolean marker);
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0084-Optimize-Hoppers.patch

@@ -1,4 +1,4 @@
-From 7a9bf3167d5a6e2cc1a2fbd66f739f373ac54e9c Mon Sep 17 00:00:00 2001
+From 6851eb5619af4d2f79884831812a779117402e7c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 18 Jan 2018 01:00:27 -0500
 Subject: [PATCH] Optimize Hoppers
@@ -7,7 +7,7 @@ Adds data about what Item related methods were used in InventoryMoveItem event
 so that the server can improve the performance of this event.
 
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
-index a8c48f5a..04d4a83b 100644
+index a8c48f5a4..04d4a83bf 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
 @@ -31,6 +31,8 @@ public class InventoryMoveItemEvent extends Event implements Cancellable {
@@ -38,5 +38,5 @@ index a8c48f5a..04d4a83b 100644
      }
  
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch

@@ -1,4 +1,4 @@
-From 5cf43f147d4882bf3bd2199979fb4915b74e3e4c Mon Sep 17 00:00:00 2001
+From 6ee338de00379380b81ef00c5af09fa30dd640ae Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 24 Feb 2018 00:55:52 -0500
 Subject: [PATCH] Tameable#getOwnerUniqueId API
@@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
 an OfflinePlayer to be loaded from disk.
 
 diff --git a/src/main/java/org/bukkit/entity/Tameable.java b/src/main/java/org/bukkit/entity/Tameable.java
-index 0c066bdf..957a6016 100644
+index 0c066bdfc..957a60167 100644
 --- a/src/main/java/org/bukkit/entity/Tameable.java
 +++ b/src/main/java/org/bukkit/entity/Tameable.java
 @@ -1,5 +1,6 @@
@@ -41,5 +41,5 @@ index 0c066bdf..957a6016 100644
       */
      @Nullable
 -- 
-2.25.0
+2.25.1
 

Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch

@@ -1,4 +1,4 @@
-From 1f100fb84d5576405ccbd83e5b9a9c08210ab689 Mon Sep 17 00:00:00 2001
+From 716f586dbbbef1b30c684d64ed58a19397aa6b70 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 11:43:30 -0400
 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
 This will allow you to change the players name or skin on login.
 
 diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index c8384da6..6c09ea6c 100644
+index c8384da69..6c09ea6c6 100644
 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 @@ -2,6 +2,9 @@ package org.bukkit.event.player;
@@ -53,5 +53,5 @@ index c8384da6..6c09ea6c 100644
          this.message = "";
          this.name = name;
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch

@@ -1,4 +1,4 @@
-From 3a712b40988d06d9a8f42119c9eb6fc0968ae18d Mon Sep 17 00:00:00 2001
+From 2ac81c41e0800c8bfe372eea825fbdcebfe7ed62 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 15:55:38 +0200
 Subject: [PATCH] Add extended PaperServerListPingEvent
@@ -8,7 +8,7 @@ and allows full control of the response sent to the client.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
 new file mode 100644
-index 00000000..0cc5dd57
+index 000000000..0cc5dd573
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
 @@ -0,0 +1,323 @@
@@ -337,7 +337,7 @@ index 00000000..0cc5dd57
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/network/StatusClient.java b/src/main/java/com/destroystokyo/paper/network/StatusClient.java
 new file mode 100644
-index 00000000..517d1523
+index 000000000..517d15238
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/StatusClient.java
 @@ -0,0 +1,13 @@
@@ -355,7 +355,7 @@ index 00000000..517d1523
 +
 +}
 diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java
-index 612958a3..bb4f7702 100644
+index 612958a33..bb4f7702c 100644
 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java
 +++ b/src/main/java/org/bukkit/util/CachedServerIcon.java
 @@ -18,4 +18,9 @@ public interface CachedServerIcon {
@@ -369,5 +369,5 @@ index 612958a3..bb4f7702 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From 5262b321dc03d1f58178d7b684ecad630cd041a4 Mon Sep 17 00:00:00 2001
+From 401c968c7e87d2d3a91798f153b8d63c1d37d269 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 420aa906..083110cc 100644
+index 088430a45..700b8721a 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;
@@ -39,5 +39,5 @@ index 420aa906..083110cc 100644
  
      // Spigot start
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0089-getPlayerUniqueId-API.patch

@@ -1,4 +1,4 @@
-From 9dcbe2f6b819b55841e1ebb138516d7a281377cc Mon Sep 17 00:00:00 2001
+From 3af92ccbed37aa47009dc73c9e40f7d6db1e2255 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 22 Mar 2018 01:39:28 -0400
 Subject: [PATCH] getPlayerUniqueId API
@@ -57,5 +57,5 @@ index 6778ac8e5..11fffc514 100644
       * Gets the plugin manager for interfacing with plugins.
       *
 -- 
-2.25.0
+2.25.1
 

Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch

@@ -1,4 +1,4 @@
-From 6b0a919a4594ce2cfe55bedf3a7faecd0a266887 Mon Sep 17 00:00:00 2001
+From 046c71d911ea7b1bdcd6f35fb3d5fa7f77d63384 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 19:30:20 +0200
 Subject: [PATCH] Add legacy ping support to PaperServerListPingEvent
@@ -8,7 +8,7 @@ client that does not support all of the features provided in the
 event.
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/StatusClient.java b/src/main/java/com/destroystokyo/paper/network/StatusClient.java
-index 517d1523..ffda9f6a 100644
+index 517d15238..ffda9f6a8 100644
 --- a/src/main/java/com/destroystokyo/paper/network/StatusClient.java
 +++ b/src/main/java/com/destroystokyo/paper/network/StatusClient.java
 @@ -10,4 +10,16 @@ import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
@@ -29,5 +29,5 @@ index 517d1523..ffda9f6a 100644
 +
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch

@@ -1,11 +1,11 @@
-From 7b106928641e7ae0f15db3f9bbad7e9cff20dea2 Mon Sep 17 00:00:00 2001
+From b8f823a3d39e1cc99f25b85485225d9f1e8c980c Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 1 Apr 2018 02:28:43 +0300
 Subject: [PATCH] Add method to open already placed sign
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 5b5fb303..cdbac95b 100644
+index 5b5fb3034..cdbac95bb 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -458,4 +458,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
@@ -23,5 +23,5 @@ index 5b5fb303..cdbac95b 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch

@@ -1,4 +1,4 @@
-From 10af44a728883c15bac804518f6f98cf91194944 Mon Sep 17 00:00:00 2001
+From da259346df446940b700aa31114efd056fef37b2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Apr 2018 10:28:50 -0400
 Subject: [PATCH] Add Ban Methods to Player Objects
@@ -8,7 +8,7 @@ Allows a more logical API for banning players.
 player.banPlayer("Breaking the rules");
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index ffc8ad37..222a9a7b 100644
+index ffc8ad373..222a9a7bf 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
 @@ -44,6 +44,61 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
@@ -74,7 +74,7 @@ index ffc8ad37..222a9a7b 100644
      /**
       * Checks if this player is whitelisted or not
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 083110cc..2c6ff39e 100644
+index 700b8721a..43e191649 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3,6 +3,10 @@ package org.bukkit.entity;
@@ -252,5 +252,5 @@ index 083110cc..2c6ff39e 100644
      /**
       * Sends an Action Bar message to the client.
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0093-EndermanEscapeEvent.patch

@@ -1,4 +1,4 @@
-From 933718c31587aca9f00374ee29bb61c0b844953f Mon Sep 17 00:00:00 2001
+From adcdedec7cd6db5eac2e0e059634490079f30d06 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:14:30 -0400
 Subject: [PATCH] EndermanEscapeEvent
@@ -9,7 +9,7 @@ You may cancel this, enabling ranged attacks to damage the enderman for example.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java
 new file mode 100644
-index 00000000..806112a8
+index 000000000..806112a8b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java
 @@ -0,0 +1,87 @@
@@ -101,5 +101,5 @@ index 00000000..806112a8
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0094-Enderman.teleportRandomly.patch

@@ -1,4 +1,4 @@
-From 22b8e1bb9689bb3b947d2129d699757c7bac34dd Mon Sep 17 00:00:00 2001
+From 370964285ffa5b68ca08697985f394d4c91b6c79 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:29:15 -0400
 Subject: [PATCH] Enderman.teleportRandomly()
@@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
 Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
 
 diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java
-index bb325d9c..821c690f 100644
+index bb325d9c8..821c690f8 100644
 --- a/src/main/java/org/bukkit/entity/Enderman.java
 +++ b/src/main/java/org/bukkit/entity/Enderman.java
 @@ -10,6 +10,17 @@ import org.jetbrains.annotations.Nullable;
@@ -28,5 +28,5 @@ index bb325d9c..821c690f 100644
       * Gets the id and data of the block that the Enderman is carrying.
       *
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch

@@ -1,4 +1,4 @@
-From bbc895e361521f3a33a517aa5b067dc3ccb003ad Mon Sep 17 00:00:00 2001
+From 57cf333277477c1a6f7ac9b5fcf035b530841765 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 17:55:28 -0400
 Subject: [PATCH] Additional world.getNearbyEntities API's
@@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
 Provides more methods to get nearby entities, and filter by types and predicates
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 3b027f67..fbe7e76c 100644
+index 3b027f67c..fbe7e76c0 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1,6 +1,9 @@
@@ -277,7 +277,7 @@ index 3b027f67..fbe7e76c 100644
       * Get a list of all players in this World
       *
 diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index 6c09ea6c..76c4a1a6 100644
+index 6c09ea6c6..76c4a1a6e 100644
 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 @@ -42,8 +42,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
@@ -291,5 +291,5 @@ index 6c09ea6c..76c4a1a6 100644
       */
      public void setPlayerProfile(@NotNull PlayerProfile profile) {
 -- 
-2.26.0
+2.25.1
 

Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch

@@ -1,11 +1,11 @@
-From 2e924d63585468de921954ade22acf335dd0d643 Mon Sep 17 00:00:00 2001
+From 6f24ef7d7b7146b9d2c032252b7866657b31c3a1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 19:27:31 -0400
 Subject: [PATCH] Location.isChunkLoaded() API
 
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 0939a807..6c8b8edd 100644
+index 0939a8070..6c8b8eddc 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -533,6 +533,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
@@ -17,5 +17,5 @@ index 0939a807..6c8b8edd 100644
      public boolean equals(Object obj) {
          if (obj == null) {
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch

@@ -1,4 +1,4 @@
-From 14230ba76aa0ced5ca25e493c15944568ca03365 Mon Sep 17 00:00:00 2001
+From 77befc8808bf1a216fdae6060f9a19d5f0b36df0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 29 Aug 2017 23:58:48 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -10,7 +10,7 @@ This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
 new file mode 100644
-index 00000000..06f1602f
+index 000000000..06f1602f5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
 @@ -0,0 +1,478 @@
@@ -493,7 +493,7 @@ index 00000000..06f1602f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 49467ac7..d2ceb07c 100644
+index 49467ac70..d2ceb07c7 100644
 --- a/src/main/java/org/bukkit/Particle.java
 +++ b/src/main/java/org/bukkit/Particle.java
 @@ -96,6 +96,17 @@ public enum Particle {
@@ -515,7 +515,7 @@ index 49467ac7..d2ceb07c 100644
       * Options which can be applied to redstone dust particles - a particle
       * color and size.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index fbe7e76c..085c7a42 100644
+index fbe7e76c0..085c7a42c 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -2433,7 +2433,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -578,5 +578,5 @@ index fbe7e76c..085c7a42 100644
      /**
       * Spawns the particle (the number of times specified by count)
 -- 
-2.26.0
+2.25.1
 

Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch

@@ -1,4 +1,4 @@
-From c8c18603ed87388a020dd699aa5c7ab3df054816 Mon Sep 17 00:00:00 2001
+From d3004d7b163f83fe6e98647f03cdfe3a90d388ae Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:17:44 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
@@ -9,7 +9,7 @@ This allows you to override/extend the pumpkin/stare logic.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
 new file mode 100644
-index 00000000..f530a3d9
+index 000000000..f530a3d93
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
 @@ -0,0 +1,101 @@
@@ -115,5 +115,5 @@ index 00000000..f530a3d9
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch

@@ -1,4 +1,4 @@
-From 889d1e3dc852de32f8f2e72ffde3f5917fa7dd5c Mon Sep 17 00:00:00 2001
+From 69e017b9ea1d488c8d73dc1d2cbb55bab33dc917 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 21:33:35 -0400
 Subject: [PATCH] Close Plugin Class Loaders on Disable
@@ -7,7 +7,7 @@ This should close more memory leaks from /reload and disabling plugins,
 by closing the class loader and the jar file.
 
 diff --git a/src/main/java/org/bukkit/plugin/PluginLoader.java b/src/main/java/org/bukkit/plugin/PluginLoader.java
-index a88733f1..6ab9cd82 100644
+index a88733f1c..6ab9cd821 100644
 --- a/src/main/java/org/bukkit/plugin/PluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/PluginLoader.java
 @@ -77,4 +77,18 @@ public interface PluginLoader {
@@ -30,7 +30,7 @@ index a88733f1..6ab9cd82 100644
 +    // Paper end - close Classloader on disable
  }
 diff --git a/src/main/java/org/bukkit/plugin/PluginManager.java b/src/main/java/org/bukkit/plugin/PluginManager.java
-index 41e26451..86cc5025 100644
+index 41e26451f..86cc5025a 100644
 --- a/src/main/java/org/bukkit/plugin/PluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/PluginManager.java
 @@ -161,6 +161,18 @@ public interface PluginManager {
@@ -53,7 +53,7 @@ index 41e26451..86cc5025 100644
       * Gets a {@link Permission} from its fully qualified name
       *
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 8ddaf9c2..8bb24f73 100644
+index 8ddaf9c2e..8bb24f734 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -492,17 +492,28 @@ public final class SimplePluginManager implements PluginManager {
@@ -97,7 +97,7 @@ index 8ddaf9c2..8bb24f73 100644
              lookupNames.clear();
              dependencyGraph = GraphBuilder.directed().build();
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index e72cbde4..32ec68b4 100644
+index e72cbde4b..32ec68b48 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -331,7 +331,7 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -140,5 +140,5 @@ index e72cbde4..32ec68b4 100644
          }
      }
 -- 
-2.26.0
+2.25.1
 

Spigot-API-Patches/0100-WitchConsumePotionEvent.patch

@@ -1,4 +1,4 @@
-From 7278c19fd5b1ecef74da0734e3905fd5cf3b9e82 Mon Sep 17 00:00:00 2001
+From 15909a0d10135b8cfa2062fb3df50d2277a10528 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:26:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent
@@ -7,7 +7,7 @@ Fires when a witch consumes the potion in their hand
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java
 new file mode 100644
-index 00000000..fbbace36
+index 000000000..fbbace36d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java
 @@ -0,0 +1,70 @@
@@ -83,7 +83,7 @@ index 00000000..fbbace36
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
 new file mode 100644
-index 00000000..6ef6367b
+index 000000000..6ef6367b6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
 @@ -0,0 +1,33 @@
@@ -121,5 +121,5 @@ index 00000000..6ef6367b
 +    }
 +}
 -- 
-2.25.0.windows.1
+2.25.1