1.15.2 update (#2887)

Functional GUI fix added by billygalbreath
2024-12-31 13:27:47 +01:00 · 2020-01-21 18:02:07 -08:00 · 2020-01-21 18:02:07 -08:00 · 19de9af63c
commit 19de9af63c
parent d4ae43fc00
624 changed files with 2369 additions and 2370 deletions
--- a/README.md
+++ b/README.md
@ -36,7 +36,7 @@ How To (Plugin Developers)
 <dependency>
    <groupId>com.destroystokyo.paper</groupId>
    <artifactId>paper-api</artifactId>
-    <version>1.15.1-R0.1-SNAPSHOT</version>
+    <version>1.15.2-R0.1-SNAPSHOT</version>
    <scope>provided</scope>
 </dependency>
 ```
--- a/Spigot-API-Patches/0001-POM-changes.patch
+++ b/Spigot-API-Patches/0001-POM-changes.patch
@ -1,11 +1,11 @@
-From 9556d6e73175d5674058d56c48928d2e0cab3006 Mon Sep 17 00:00:00 2001
+From 4ad4bdf9fc777147561c4f62fbd84bba4fef3271 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 fd011758..416da4ae 100644
+index 044afc49..8c443c52 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -2,34 +2,28 @@
@ -22,7 +22,7 @@ index fd011758..416da4ae 100644
 -    <artifactId>spigot-api</artifactId>
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper-api</artifactId>
-     <version>1.15.1-R0.1-SNAPSHOT</version>
+     <version>1.15.2-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 -    <name>Spigot-API</name>
@ -111,5 +111,5 @@ index fd011758..416da4ae 100644
                     <shadedArtifactAttached>true</shadedArtifactAttached>
                 </configuration>
 -- 
-2.24.1
+2.25.0.windows.1

--- a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch
+++ b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch
@ -1,4 +1,4 @@
-From 900d1808e8b2df014a6f10a66d8293484735f9dc Mon Sep 17 00:00:00 2001
+From c34a0b40b799e91263262c942be9994f6aaed9b7 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 aef4ec33d..2daee11a2 100644
+index 8c443c52..a540adef 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -49,6 +49,12 @@
@ -23,5 +23,5 @@ index aef4ec33d..2daee11a2 100644
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
 -- 
-2.22.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0003-Paper-Utils.patch
+++ b/Spigot-API-Patches/0003-Paper-Utils.patch
@ -1,4 +1,4 @@
-From 7abc5f9f843420fdc68e86f72c193f1f1ace76d8 Mon Sep 17 00:00:00 2001
+From 987a04e5fe2faa15848c4e8ce6c6c63e12da47cd 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 000000000..9db0056ab
+index 00000000..9db0056a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java
@@ -0,0 +1,16 @@
@ -27,5 +27,5 @@ index 000000000..9db0056ab
 +
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0004-Timings-v2.patch
+++ b/Spigot-API-Patches/0004-Timings-v2.patch
@ -1,4 +1,4 @@
-From 8367abf2c43595a130e0397c278da82e7d50f0b2 Mon Sep 17 00:00:00 2001
+From f6e991d49e6476fb94781ddaa0ec805bdd354243 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
@ -4114,5 +4114,5 @@ index b71235f6..3cbe5c2b 100644
 +
 }
 -- 
-2.25.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch
+++ b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch
@ -1,4 +1,4 @@
-From 69623dfbf01028f91c52e15f6d096f85dad57354 Mon Sep 17 00:00:00 2001
+From 530c3715e2a2fbf308229c1e23d704e8cb3c9c75 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
@ -32,5 +32,5 @@ index 4d9ed678..89dcc9d4 100644
      * Update the list of commands sent to the client.
      * <br>
 -- 
-2.25.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0006-Add-getTPS-method.patch
+++ b/Spigot-API-Patches/0006-Add-getTPS-method.patch
@ -1,11 +1,11 @@
-From bc6a70d6bdab8d4b350e6321f315edc5c3f932b6 Mon Sep 17 00:00:00 2001
+From 510b3804346327935a0f02423c54a46b68649235 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


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 940c643df..9f87f333e 100644
+index 940c643d..9f87f333 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1311,6 +1311,17 @@ public final class Bukkit {
@ -27,7 +27,7 @@ index 940c643df..9f87f333e 100644
      * Get the advancement specified by this key.
      *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c197e3811..e1dfa92a9 100644
+index c197e381..e1dfa92a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -1096,6 +1096,16 @@ public interface Server extends PluginMessageRecipient {
@ -48,5 +48,5 @@ index c197e3811..e1dfa92a9 100644
      * Get the advancement specified by this key.
      *
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0007-Entity-Origin-API.patch
+++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch
@ -1,4 +1,4 @@
-From 417c860ef8f5168eafc0268f4a21f74ebdd06f8e Mon Sep 17 00:00:00 2001
+From 7b2e3ac64e82aa6b5d59c0e89989b8a21cf767e2 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
@ -66,5 +66,5 @@ index 5a878932..3022b4a2 100644
 +    }
 }
 -- 
-2.24.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0008-Version-Command-2.0.patch
+++ b/Spigot-API-Patches/0008-Version-Command-2.0.patch
@ -1,4 +1,4 @@
-From c2f8a5c4612e7ece86b19e5a3f731c04949ec86f Mon Sep 17 00:00:00 2001
+From 4c7cf74d7f8635e4e964d51900bcf71e329526e9 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
@ -176,5 +176,5 @@ index cbce5244..0486abd1 100644
         try {
             BufferedReader reader = Resources.asCharSource(
 -- 
-2.24.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch
+++ b/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch
@ -1,4 +1,4 @@
-From 0e9476604dfa54e5502607d51dc95c61b15ceb84 Mon Sep 17 00:00:00 2001
+From 0b59e94d724a2181a301a41753de636276177154 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 000000000..29dd763a9
+index 00000000..29dd763a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java
@@ -0,0 +1,50 @@
@ -61,5 +61,5 @@ index 000000000..29dd763a9
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch
+++ b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch
@ -1,4 +1,4 @@
-From 6af56a2e1e0c3aa3a8a3fa62d936b6d74a255800 Mon Sep 17 00:00:00 2001
+From 2fb8620a338c9f9a94c6af2335a7e02c85d9a98f 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
@ -30,5 +30,5 @@ index 89dcc9d4..195c70d1 100644
 
     /**
 -- 
-2.25.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch
+++ b/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch
@ -1,4 +1,4 @@
-From 03e1b338735a7e2ee5581026c54c4b5ffdb4d1f5 Mon Sep 17 00:00:00 2001
+From d4c36e931e1c6a71cd65d79444a85a29e0ab4bae 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 000000000..978813b94
+index 00000000..978813b9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
@@ -0,0 +1,86 @@
@ -97,5 +97,5 @@ index 000000000..978813b94
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch
@ -1,4 +1,4 @@
-From 5b64272f8b996dfd47d85e64bd0136bb602199de Mon Sep 17 00:00:00 2001
+From a29b417ddcedcd6a1c39aa9401f917ebd6e3c6e0 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 000000000..8e407eff1
+index 00000000..8e407eff
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
@@ -0,0 +1,47 @@
@ -59,5 +59,5 @@ index 000000000..8e407eff1
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch
+++ b/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch
@ -1,11 +1,11 @@
-From 3b78215f400807e9ceb571c960f4bdee7da8aea7 Mon Sep 17 00:00:00 2001
+From e1e9d92d79906e193a159ecad87a1f2afd8ff06c 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 82e379d16..12601db68 100644
+index 82e379d1..12601db6 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -345,6 +345,10 @@ public final class JavaPluginLoader implements PluginLoader {
@ -20,5 +20,5 @@ index 82e379d16..12601db68 100644
 
             // Perhaps abort here, rather than continue going, but as it stands,
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch
+++ b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch
@ -1,11 +1,11 @@
-From 1609f1dd56d9b507e3e9b35dd4cfb2b402af24fc Mon Sep 17 00:00:00 2001
+From d411f2a704717d2fbb816b27fe96f7632abf64a3 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


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 9f87f333e..63e48ef3f 100644
+index 9f87f333..63e48ef3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1485,6 +1485,19 @@ public final class Bukkit {
@ -29,7 +29,7 @@ index 9f87f333e..63e48ef3f 100644
     public static Server.Spigot spigot()
     {
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e1dfa92a9..87300a5df 100644
+index e1dfa92a..87300a5d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -1106,6 +1106,15 @@ public interface Server extends PluginMessageRecipient {
@ -49,5 +49,5 @@ index e1dfa92a9..87300a5df 100644
      * Get the advancement specified by this key.
      *
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@ -1,4 +1,4 @@
-From 425e0884f3112dde54266793417f71afdb0de1a8 Mon Sep 17 00:00:00 2001
+From 18a481b942f840e9be0a1f0eadae88c7e336a540 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
@ -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 0fb36ebd..9a79e409 100644
+index 195c70d1..5580cdbe 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 0fb36ebd..9a79e409 100644
      * Forces an update of the player's entire inventory.
      *
 -- 
-2.24.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
@ -1,4 +1,4 @@
-From d2fe81e66aa64df04655b6c92751cca9d544172f Mon Sep 17 00:00:00 2001
+From 6b39c2b09405e827d4d7d2c774b54651b39efa89 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
@ -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 9a79e409..81677fcd 100644
+index 5580cdbe..2017a51d 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 9a79e409..81677fcd 100644
 
     /**
 -- 
-2.24.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0017-Add-exception-reporting-event.patch
+++ b/Spigot-API-Patches/0017-Add-exception-reporting-event.patch
@ -1,4 +1,4 @@
-From 21c928ac4a621dd3024e55743da904c9f3423e37 Mon Sep 17 00:00:00 2001
+From a838f3134bc88bddefc502559b123c6ce1e39bab 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
@ -603,5 +603,5 @@ index 53e5045f..9a09b4d2 100644
         }
     }
 -- 
-2.22.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch
+++ b/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch
@ -1,4 +1,4 @@
-From 6f396335289763e35a0fc5293654713c15ea1df2 Mon Sep 17 00:00:00 2001
+From 709bd509e61a7f25b64fe128b2ae42a5bef797d0 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 46b119017..05167fb34 100644
+index 46b11901..05167fb3 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 46b119017..05167fb34 100644
 
     public ServerEvent(boolean isAsync) {
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
+++ b/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
@ -1,11 +1,11 @@
-From 991fa18b84baaf4b0ec6242b27f32888e411dab9 Mon Sep 17 00:00:00 2001
+From 8ecc2f468db20ab448dffd9684f101f3c2e3fa83 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 74816c63f..be11d52a0 100644
+index 74816c63..be11d52a 100644
 --- a/src/main/java/org/bukkit/command/CommandSender.java
 +++ b/src/main/java/org/bukkit/command/CommandSender.java
@@ -62,4 +62,30 @@ public interface CommandSender extends Permissible {
@ -40,5 +40,5 @@ index 74816c63f..be11d52a0 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@ -1,11 +1,11 @@
-From d4febe68b0b2e65542f21afe0320193e9c28e360 Mon Sep 17 00:00:00 2001
+From 6edea23ef413c2a6d73d490367a10019e2693bfa 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


 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index e6249c2bf..5697728ce 100644
+index a5ea8f44..f5969cad 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -500,4 +500,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@ -29,5 +29,5 @@ index e6249c2bf..5697728ce 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch
+++ b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch
@ -1,4 +1,4 @@
-From 6f43acffa83a9b928af1474f6cba3daa45813dc3 Mon Sep 17 00:00:00 2001
+From 984cee00d239d54cbff29eb607aee7ec665bc07e 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
@ -119,5 +119,5 @@ index b9819565..4c2102a1 100644
      * Gets the status of this pack.
      *
 -- 
-2.25.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch
+++ b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch
@ -1,4 +1,4 @@
-From 185096afc97f9e07872d20bf890627c4010093cc Mon Sep 17 00:00:00 2001
+From d3d0edba86d8318435145cb01dc7e8a9c7900d1a 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,23 +6,23 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.

 diff --git a/pom.xml b/pom.xml
-index 2c2823b3..a6567413 100644
+index a540adef..5c25ff12 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -128,6 +128,17 @@
-             <version>7.2</version>
+             <version>7.3.1</version>
             <scope>test</scope>
         </dependency>
 +        <!-- ASM -->
 +        <dependency>
 +            <groupId>org.ow2.asm</groupId>
 +            <artifactId>asm</artifactId>
-+            <version>7.1</version>
+            <version>7.3.1</version>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.ow2.asm</groupId>
 +            <artifactId>asm-commons</artifactId>
-+            <version>7.1</version>
+            <version>7.3.1</version>
 +        </dependency>
     </dependencies>
 
@ -439,5 +439,5 @@ index 12601db6..06b6724f 100644
                 eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
             } else {
 -- 
-2.24.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch
+++ b/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch
@ -1,4 +1,4 @@
-From 71c0afbf707a3bb5c2b3d01f144acf3bd6d60bc4 Mon Sep 17 00:00:00 2001
+From ac25178018130d824244228559daeb62c031b5c1 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 18d0636b7..8ec56cd6b 100644
+index 18d0636b..8ec56cd6 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 18d0636b7..8ec56cd6b 100644
      * Convenience method for providing a user-friendly identifier. By
      * default, it is the event's class's {@linkplain Class#getSimpleName()
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch
+++ b/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch
@ -1,4 +1,4 @@
-From 7aa10c0e4606c992367eaed629d6362f46234744 Mon Sep 17 00:00:00 2001
+From cf697b427b7974f18fcd07174c664d239843ff1f 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 a6ad94ef9..9d4f553c0 100644
+index a6ad94ef..9d4f553c 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 a6ad94ef9..9d4f553c0 100644
         while (index != -1) {
             int start = index;
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
@ -1,4 +1,4 @@
-From b573cff5fd3fc21d5fd4528473ad4b574900ce4b Mon Sep 17 00:00:00 2001
+From 5b3f635c4a9f2014dfd33488958413331194b9f8 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
@ -103,5 +103,5 @@ index 9a09b4d2..c7388d51 100644
 +
 }
 -- 
-2.22.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch
@ -1,11 +1,11 @@
-From f2d75b2305da564f7bf67db3354fbc8d06601225 Mon Sep 17 00:00:00 2001
+From 0f2180289eb27d8af3ad7ec6132eca352efc7ccc 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 c2793f3ef..373f4b5b5 100644
+index c2793f3e..373f4b5b 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 c2793f3ef..373f4b5b5 100644
     public boolean isCancelled() {
         return this.isCancelled;
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch
@ -1,11 +1,11 @@
-From 161216be890690e9d2eaeee9eae695cd0be921ed Mon Sep 17 00:00:00 2001
+From 1ffda222e9676022f70fdf8c7735987051e5ff7c 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 88ce9dc6b..96916ec95 100644
+index 88ce9dc6..96916ec9 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 88ce9dc6b..96916ec95 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch
@ -1,4 +1,4 @@
-From d52052dd79d229e71d29da0873547ddae1933053 Mon Sep 17 00:00:00 2001
+From dec02429dc56f84c69c327df0f87b1919f6579a2 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 000000000..07660202e
+index 00000000..07660202
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java
@@ -0,0 +1,32 @@
@ -44,7 +44,7 @@ index 000000000..07660202e
 +}
 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 000000000..e5dbbd660
+index 00000000..e5dbbd66
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java
@@ -0,0 +1,29 @@
@ -78,5 +78,5 @@ index 000000000..e5dbbd660
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0029-EntityPathfindEvent.patch
+++ b/Spigot-API-Patches/0029-EntityPathfindEvent.patch
@ -1,4 +1,4 @@
-From 13ce91688059f9bc8beabdffaa96a6dafac1d328 Mon Sep 17 00:00:00 2001
+From f785fe7ad6eead77bc5103ec2702f4993373e8a9 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 000000000..63e46b2fb
+index 00000000..63e46b2f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java
@@ -0,0 +1,82 @@
@ -94,5 +94,5 @@ index 000000000..63e46b2fb
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch
+++ b/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch
@ -1,4 +1,4 @@
-From 05ccd4a953088abcf6c53aa0c838659284e9c092 Mon Sep 17 00:00:00 2001
+From afee8fb7282413c3d47adc3b5c697f1eb2cf1036 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
@ -89,5 +89,5 @@ index baf85022..d363d517 100644
         for (Map<Plugin, MetadataValue> values : metadataMap.values()) {
             if (values.containsKey(owningPlugin)) {
 -- 
-2.24.1
+2.25.0.windows.1

--- a/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch
+++ b/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch
@ -1,4 +1,4 @@
-From a63c6275864661b88d37ebb5870a53c978d2498d Mon Sep 17 00:00:00 2001
+From 6ddb428ccd0bcf637ffbd9542cc78facdd1b3e39 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 b3d85d973..0e8cd85c7 100644
+index d363d517..abbe545a 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 b3d85d973..0e8cd85c7 100644
      * Creates a unique name for the object receiving metadata by combining
      * unique data from the subject with a metadataKey.
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch
@ -1,4 +1,4 @@
-From d24c31b6a1b4263c4d50cf971287d737211ab17c Mon Sep 17 00:00:00 2001
+From 90a091641aad273ceec6d85f70bcc72fa451f316 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 000000000..09cfdf48e
+index 00000000..09cfdf48
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java
@@ -0,0 +1,46 @@
@ -57,5 +57,5 @@ index 000000000..09cfdf48e
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@ -1,4 +1,4 @@
-From 36607b558d3ac1a3122354442bf6d54764094279 Mon Sep 17 00:00:00 2001
+From ca75c6d3c7ec62bcb6c2022bd8a2678813c50104 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 000000000..f0bb4e31c
+index 00000000..f0bb4e31
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
@@ -0,0 +1,222 @@
@ -234,5 +234,5 @@ index 000000000..f0bb4e31c
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch
+++ b/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch
@ -1,4 +1,4 @@
-From fc20f0c50630c3172e924b34dfa1e912b8728a74 Mon Sep 17 00:00:00 2001
+From 9083c64a839306592c6048a3eaf2d47dbe8dd590 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
@ -48,5 +48,5 @@ index 88cebc00..b2bf62a5 100644
 +    // Paper end
 }
 -- 
-2.22.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch
@ -1,11 +1,11 @@
-From 7e61db52ad3ceaae7d2b495a51f6e7bbb22f4ccf Mon Sep 17 00:00:00 2001
+From 1e799e05cca516707285471789f33d58cba384b7 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 8feb6698f..d51d2ec1d 100644
+index 8feb6698..d51d2ec1 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 8feb6698f..d51d2ec1d 100644
     /**
      * Gets the amount of regained health
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0036-LootTable-API.patch
+++ b/Spigot-API-Patches/0036-LootTable-API.patch
@ -1,4 +1,4 @@
-From 57c87e1ca56c7ea43bb0a4eba69000e7ab71a05d Mon Sep 17 00:00:00 2001
+From adbfe47db1430abf4f538b0dd7bc4aaebcdbff9a 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 000000000..92d7b853a
+index 00000000..92d7b853
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
@@ -0,0 +1,17 @@
@ -35,7 +35,7 @@ index 000000000..92d7b853a
 +}
 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 000000000..b387894fe
+index 00000000..b387894f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
@@ -0,0 +1,17 @@
@ -58,7 +58,7 @@ index 000000000..b387894fe
 +}
 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 000000000..97815eeb2
+index 00000000..97815eeb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
@@ -0,0 +1,116 @@
@ -180,7 +180,7 @@ index 000000000..97815eeb2
 +}
 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 000000000..fd184f13f
+index 00000000..fd184f13
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
@@ -0,0 +1,45 @@
@ -230,7 +230,7 @@ index 000000000..fd184f13f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java
-index c67d71101..a569c7b63 100644
+index c67d7110..a569c7b6 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 c67d71101..a569c7b63 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 74cd194c9..07af1a3f0 100644
+index 74cd194c..07af1a3f 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 74cd194c9..07af1a3f0 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 424392fb5..c76202321 100644
+index 424392fb..c7620232 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 424392fb5..c76202321 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 58e493099..7ade312f1 100644
+index 58e49309..7ade312f 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 58e493099..7ade312f1 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 938f9aead..42f5b4ea3 100644
+index 938f9aea..42f5b4ea 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 938f9aead..42f5b4ea3 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 937b99f87..db69687a7 100644
+index 937b99f8..db69687a 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 937b99f87..db69687a7 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 9ea403e6f..238d118f7 100644
+index 9ea403e6..238d118f 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 9ea403e6f..238d118f7 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 24a3d989d..901db8524 100644
+index 24a3d989..901db852 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 24a3d989d..901db8524 100644
      * Set the seed used when this Loot Table generates loot.
      *
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0037-Add-EntityZapEvent.patch
+++ b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch
@ -1,4 +1,4 @@
-From f85769e8ba9c1aa2b67b14ed2c91ad26f639801f Mon Sep 17 00:00:00 2001
+From 8c1752d4801781454495bf4d0eb5554cc270538f 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 000000000..3b725a489
+index 00000000..3b725a48
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
@@ -0,0 +1,65 @@
@ -76,7 +76,7 @@ index 000000000..3b725a489
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-index 0e0ed93b5..d3949edfc 100644
+index 0e0ed93b..d3949edf 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 0e0ed93b5..d3949edfc 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0038-Misc-Utils.patch
+++ b/Spigot-API-Patches/0038-Misc-Utils.patch
@ -1,4 +1,4 @@
-From 95c4831ed2b33d90983a86cbc86499d295e11ff7 Mon Sep 17 00:00:00 2001
+From 952aa5667bd48ddb71a0b357b7ae97622d964320 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 000000000..5bb677ce5
+index 00000000..5bb677ce
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java
@@ -0,0 +1,34 @@
@ -45,5 +45,5 @@ index 000000000..5bb677ce5
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
@ -1,4 +1,4 @@
-From 6d86d66bd93daede804713ec231c758574fcb62b Mon Sep 17 00:00:00 2001
+From e947d31d9b14ec3f5e6ec961737a801429728238 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
@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml

 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a3682b291..a0a8b5408 100644
+index a3682b29..a0a8b540 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1523,6 +1523,15 @@ public final class Bukkit {
@ -26,7 +26,7 @@ index a3682b291..a0a8b5408 100644
 
     @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 18faba0e2..d20e044dd 100644
+index 18faba0e..d20e044d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -1340,4 +1340,6 @@ public interface Server extends PluginMessageRecipient {
@ -37,7 +37,7 @@ index 18faba0e2..d20e044dd 100644
 +    boolean reloadCommandAliases(); // Paper
 }
 diff --git a/src/main/java/org/bukkit/command/CommandMap.java b/src/main/java/org/bukkit/command/CommandMap.java
-index bd2c7a696..864c263bb 100644
+index bd2c7a69..864c263b 100644
 --- a/src/main/java/org/bukkit/command/CommandMap.java
 +++ b/src/main/java/org/bukkit/command/CommandMap.java
@@ -128,4 +128,14 @@ public interface CommandMap {
@ -56,7 +56,7 @@ index bd2c7a696..864c263bb 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index adfc7aae2..460fda05a 100644
+index adfc7aae..460fda05 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -297,4 +297,11 @@ public class SimpleCommandMap implements CommandMap {
@ -72,7 +72,7 @@ index adfc7aae2..460fda05a 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-index c62da4131..af8ab73fe 100644
+index c62da413..af8ab73f 100644
 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
@@ -13,7 +13,7 @@ public class ReloadCommand extends BukkitCommand {
@ -99,5 +99,5 @@ index c62da4131..af8ab73fe 100644
                 confirmed = true;
             } else {
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch
@ -1,11 +1,11 @@
-From e3a455149e609554da57c83f1985c438e5aeec54 Mon Sep 17 00:00:00 2001
+From 64007b93caf3708274585172c66edb0e11d04b24 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 c99c9281e..7c340f539 100644
+index c99c9281..7c340f53 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 c99c9281e..7c340f539 100644
      * Get the amount of experience the player will receive
      *
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch
+++ b/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch
@ -1,4 +1,4 @@
-From f5b16f625b82df46d0a83f2bb795f77e2bcc91d6 Mon Sep 17 00:00:00 2001
+From a7ee9a6f5fc22809be5c20ec306953af7b49c522 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 000000000..453663893
+index 00000000..45366389
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
@@ -0,0 +1,67 @@
@ -78,5 +78,5 @@ index 000000000..453663893
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch
+++ b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch
@ -1,4 +1,4 @@
-From fe8cbc53a90843f7467aacb0e1de2206794758ce Mon Sep 17 00:00:00 2001
+From 5494d9b77576cb7705c385f9ce247ff1772fda1a 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
@ -72,5 +72,5 @@ index 307e5568..85a5637f 100644
             throw new UnsupportedOperationException("Not supported yet.");
         }
 -- 
-2.25.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch
@ -1,11 +1,11 @@
-From 49e1a0eb87be8cf0e59a9f8238fa1f8bdcebf5e0 Mon Sep 17 00:00:00 2001
+From 7810dbaa9a938b5ea942e829753f33c17e252c35 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 d04e52fbe..387d04e5b 100644
+index d04e52fb..387d04e5 100644
 --- a/src/main/java/org/bukkit/entity/ArmorStand.java
 +++ b/src/main/java/org/bukkit/entity/ArmorStand.java
@@ -271,4 +271,22 @@ public interface ArmorStand extends LivingEntity {
@ -32,5 +32,5 @@ index d04e52fbe..387d04e5b 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0044-IllegalPacketEvent.patch
+++ b/Spigot-API-Patches/0044-IllegalPacketEvent.patch
@ -1,4 +1,4 @@
-From a8f5ece74e38bb84395fa50e72af2d7ecb6fb1c9 Mon Sep 17 00:00:00 2001
+From e9e0b9f25fba2df081017bb48db56bfa40e364f6 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 000000000..37a17f0bb
+index 00000000..37a17f0b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java
@@ -0,0 +1,70 @@
@ -84,5 +84,5 @@ index 000000000..37a17f0bb
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0045-Fireworks-API-s.patch
+++ b/Spigot-API-Patches/0045-Fireworks-API-s.patch
@ -1,4 +1,4 @@
-From 8150d2e2f980098303ea44b05391d21b75f78a96 Mon Sep 17 00:00:00 2001
+From 0b298d491792d27eb44e0f47efa1bf643b5297fb 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
@ -37,5 +37,5 @@ index f844d5aa..e8c04c13 100644
 +    // Paper end
 }
 -- 
-2.23.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch
@ -1,4 +1,4 @@
-From d195a143ae7c58d0a4baa03bb5c499c5ca5005ee Mon Sep 17 00:00:00 2001
+From 3bcf7bff9c9f71c3122f392b2c723f7a046c43bb 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 000000000..b64ab6eec
+index 00000000..b64ab6ee
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java
@@ -0,0 +1,29 @@
@ -41,5 +41,5 @@ index 000000000..b64ab6eec
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch
@ -1,4 +1,4 @@
-From 41416263ef8de31d9129e830cfffaf406bc56060 Mon Sep 17 00:00:00 2001
+From 94279e0d80150a70cdd70a23eb90b736f4980703 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 4af195b4..58414e01 100644
+index 4cbf6101..edd73f41 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -39,6 +39,33 @@ import org.jetbrains.annotations.Nullable;
@ -45,5 +45,5 @@ index 4af195b4..58414e01 100644
      * Gets the {@link Block} at the given coordinates
      *
 -- 
-2.22.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@ -1,4 +1,4 @@
-From 10036e2271d95fe3aad4c1f99ce26ce01983a28e Mon Sep 17 00:00:00 2001
+From 55be87884e78cf987c5f047e44e15d509fcc1fc5 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 c286edfd8..dec70bbfa 100644
+index c286edfd..dec70bbf 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 c286edfd8..dec70bbfa 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch
+++ b/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch
@ -1,11 +1,11 @@
-From 60572f2bac5d9d2b536872d4a31b06b5e954115d Mon Sep 17 00:00:00 2001
+From 0514c1bc80be7336de8681a0bd9e594894c51a1e 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 7e8f5649c..afb7b136b 100644
+index 7e8f5649..afb7b136 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 7e8f5649c..afb7b136b 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
@ -1,4 +1,4 @@
-From 97c0bae11704c0340b9a20d26d06cd1bc286c7be Mon Sep 17 00:00:00 2001
+From 151c09ccc86062ae1d57ba7de2f37e27389888d3 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
@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a0a8b5408..b5b77b2d8 100644
+index a0a8b540..b5b77b2d 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1532,6 +1532,16 @@ public final class Bukkit {
@ -27,7 +27,7 @@ index a0a8b5408..b5b77b2d8 100644
 
     @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d20e044dd..103897fbe 100644
+index d20e044d..103897fb 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -1342,4 +1342,14 @@ public interface Server extends PluginMessageRecipient {
@ -46,7 +46,7 @@ index d20e044dd..103897fbe 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java
-index 7f153000e..1e126487d 100644
+index 7f153000..1e126487 100644
 --- a/src/main/java/org/bukkit/command/PluginCommand.java
 +++ b/src/main/java/org/bukkit/command/PluginCommand.java
@@ -151,6 +151,7 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
@ -58,5 +58,5 @@ index 7f153000e..1e126487d 100644
         }
         return completions;
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch
+++ b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch
@ -1,4 +1,4 @@
-From bf3a1674d443421c9ad56d00cb9d410e0882c544 Mon Sep 17 00:00:00 2001
+From 5d94f183e60047f21dfef16d2c9fe8a2b8155a46 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,10 +6,10 @@ 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 df4caf29..ca60c514 100644
+index edd73f41..220420ed 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1862,6 +1862,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1859,6 +1859,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
      * @param count the number of particles
      * @param data the data to use for the particle or null,
      *             the type of this depends on {@link Particle#getDataType()}
@ -17,7 +17,7 @@ index df4caf29..ca60c514 100644
      */
     public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
 
-@@ -1878,6 +1879,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1875,6 +1876,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
      * @param count the number of particles
      * @param data the data to use for the particle or null,
      *             the type of this depends on {@link Particle#getDataType()}
@ -25,7 +25,7 @@ index df4caf29..ca60c514 100644
      */
     public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
 
-@@ -1928,6 +1930,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1925,6 +1927,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
      * @param offsetZ the maximum random offset on the Z axis
      * @param data the data to use for the particle or null,
      *             the type of this depends on {@link Particle#getDataType()}
@ -33,7 +33,7 @@ index df4caf29..ca60c514 100644
      */
     public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
 
-@@ -1948,6 +1951,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1945,6 +1948,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
      * @param offsetZ the maximum random offset on the Z axis
      * @param data the data to use for the particle or null,
      *             the type of this depends on {@link Particle#getDataType()}
@ -41,7 +41,7 @@ index df4caf29..ca60c514 100644
      */
     public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
 
-@@ -2004,6 +2008,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2001,6 +2005,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
      *              particle used (normally speed)
      * @param data the data to use for the particle or null,
      *             the type of this depends on {@link Particle#getDataType()}
@ -49,7 +49,7 @@ index df4caf29..ca60c514 100644
      */
     public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
 
-@@ -2026,6 +2031,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2023,6 +2028,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
      *              particle used (normally speed)
      * @param data the data to use for the particle or null,
      *             the type of this depends on {@link Particle#getDataType()}
@ -57,7 +57,7 @@ index df4caf29..ca60c514 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);
 
-@@ -2049,6 +2055,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2046,6 +2052,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
      * @param force whether to send the particle to players within an extended
      *              range and encourage their client to render it regardless of
      *              settings
@ -65,7 +65,7 @@ index df4caf29..ca60c514 100644
      */
     public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
 
-@@ -2074,6 +2081,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2071,6 +2078,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
      * @param force whether to send the particle to players within an extended
      *              range and encourage their client to render it regardless of
      *              settings
@ -192,5 +192,5 @@ index 1b2267f4..1a58734d 100644
         return to;
     }
 -- 
-2.25.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0052-Item-canEntityPickup.patch
+++ b/Spigot-API-Patches/0052-Item-canEntityPickup.patch
@ -1,11 +1,11 @@
-From 9a6e1cc4daf83cbd118f9d47e5ab20ce4015018c Mon Sep 17 00:00:00 2001
+From d71df227a9f6de7d4a3fd1f0345b8f561c3c3bb1 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 00c58c1d9..cb9e9f369 100644
+index 00c58c1d..cb9e9f36 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 00c58c1d9..cb9e9f369 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch
@ -1,11 +1,11 @@
-From 86d616000511cc1aeed2f8a4870f13de4abad628 Mon Sep 17 00:00:00 2001
+From ac6c730b5828a6f3afdfd5b74cfff7dc5ffb87af 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 951ea2cc7..18d82c111 100644
+index 951ea2cc..18d82c11 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 951ea2cc7..18d82c111 100644
 
     @NotNull
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch
@ -1,4 +1,4 @@
-From b76fc97a0232e55bf7fbe24cbb97a14ae59b4abf Mon Sep 17 00:00:00 2001
+From b8556b9570db71c4791eb5ec64ecd258d48e9737 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 000000000..fb5cb3dc4
+index 00000000..fb5cb3dc
 --- /dev/null
 +++ b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java
@@ -0,0 +1,89 @@
@ -100,5 +100,5 @@ index 000000000..fb5cb3dc4
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch
+++ b/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch
@ -1,4 +1,4 @@
-From 4dc8f1c4e6badf0aa20464f3143a585c669d7c23 Mon Sep 17 00:00:00 2001
+From 7d8324440f38691b133a6173eec32ffff6764533 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 000000000..251342c3c
+index 00000000..251342c3
 --- /dev/null
 +++ b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
@@ -0,0 +1,82 @@
@ -93,5 +93,5 @@ index 000000000..251342c3c
 +}
 +
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch
+++ b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch
@ -1,4 +1,4 @@
-From 745b108aba89064f140eddb28bf6a793bbb45e75 Mon Sep 17 00:00:00 2001
+From 10fb919b099319913ad3b39f2ae5b3533fb0273a 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
@ -7,7 +7,7 @@ Provides basic elements of a PlayerProfile to be used by future API/events

 diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
 new file mode 100644
-index 000000000..476151d2a
+index 00000000..476151d2
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
@@ -0,0 +1,145 @@
@ -158,7 +158,7 @@ index 000000000..476151d2a
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
 new file mode 100644
-index 000000000..7b3b6ef53
+index 00000000..7b3b6ef5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
@@ -0,0 +1,72 @@
@ -235,7 +235,7 @@ index 000000000..7b3b6ef53
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b5b77b2d8..161a714e5 100644
+index b5b77b2d..161a714e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1542,6 +1542,40 @@ public final class Bukkit {
@ -280,7 +280,7 @@ index b5b77b2d8..161a714e5 100644
 
     @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 103897fbe..463724e40 100644
+index 103897fb..463724e4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -1351,5 +1351,33 @@ public interface Server extends PluginMessageRecipient {
@ -318,5 +318,5 @@ index 103897fbe..463724e40 100644
     // Paper end
 }
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch
+++ b/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch
@ -1,11 +1,11 @@
-From 7cde5685e8d20a16d2cd7dc7f86c964a2a3b70ea Mon Sep 17 00:00:00 2001
+From 9d1fc09e269f884e5740bfc253532f11c0e26d79 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 6277f3928..5b5fb3034 100644
+index 6277f392..5b5fb303 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 6277f3928..5b5fb3034 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.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0058-Profile-Lookup-Events.patch
+++ b/Spigot-API-Patches/0058-Profile-Lookup-Events.patch
@ -1,4 +1,4 @@
-From 6937460f262795c9820420cf93e6c0ef4fbcffd5 Mon Sep 17 00:00:00 2001
+From 0ae5d7576d18a61f327e7ebb939a3cb9aa79f7d4 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 000000000..8df37c07c
+index 00000000..8df37c07
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java
@@ -0,0 +1,46 @@
@ -60,7 +60,7 @@ index 000000000..8df37c07c
 +}
 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 000000000..4dcf6242c
+index 00000000..4dcf6242
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java
@@ -0,0 +1,108 @@
@ -173,5 +173,5 @@ index 000000000..4dcf6242c
 +
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
+++ b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
@ -1,4 +1,4 @@
-From fd4f5b79ced349d3b9bf58d77a569234b46f15f3 Mon Sep 17 00:00:00 2001
+From 3508113428e6d92f80a705827efc4290fb961602 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()
@ -22,5 +22,5 @@ index 8cfcc3a5..bd8507f6 100644
     // Paper end
 }
 -- 
-2.24.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch
@ -1,4 +1,4 @@
-From 2eda3cf357cb4091bea1a72f982602e9104ce211 Mon Sep 17 00:00:00 2001
+From 72e4471858378ddc591e391d2aae62c1937fb07d 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 000000000..163ffe8ff
+index 00000000..163ffe8f
 --- /dev/null
 +++ b/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java
@@ -0,0 +1,21 @@
@ -34,7 +34,7 @@ index 000000000..163ffe8ff
 +    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 608e99c42..53498debe 100644
+index 608e99c4..53498deb 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 608e99c42..53498debe 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 2fa2c9d07..5ac1afb8a 100644
+index 2fa2c9d0..5ac1afb8 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 2fa2c9d07..5ac1afb8a 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 000000000..7944f26a3
+index 00000000..7944f26a
 --- /dev/null
 +++ b/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java
@@ -0,0 +1,3 @@
@ -82,5 +82,5 @@ index 000000000..7944f26a3
 +
 +public interface SaddledHorseInventory extends AbstractHorseInventory {}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0061-ensureServerConversions-API.patch
+++ b/Spigot-API-Patches/0061-ensureServerConversions-API.patch
@ -1,4 +1,4 @@
-From abf4b44e9de9046faa4172331986876faaef5d7a Mon Sep 17 00:00:00 2001
+From db21e17ea6d14094bfc90f8883252c0725e386c3 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 4ff149fd9..bb3f7cdc1 100644
+index 4ff149fd..bb3f7cdc 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,10 +29,10 @@ index 4ff149fd9..bb3f7cdc1 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index bab86d804..44f3bec7d 100644
+index 9d9df827..8d9ebcb3 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -518,7 +518,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -534,7 +534,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
             }
         }
 
@ -41,7 +41,7 @@ index bab86d804..44f3bec7d 100644
     }
 
     /**
-@@ -577,4 +577,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -593,4 +593,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
 
         return true;
     }
@ -62,5 +62,5 @@ index bab86d804..44f3bec7d 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch
+++ b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch
@ -1,4 +1,4 @@
-From a053762804bf81a788e6de7c9d134d396774902c Mon Sep 17 00:00:00 2001
+From 5be3ee85ce36300d867bfa63eea2334d876527d8 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 bb3f7cdc1..3cada3487 100644
+index bb3f7cdc..3cada348 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,10 +29,10 @@ index bb3f7cdc1..3cada3487 100644
     // Paper end
 }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 44f3bec7d..9526cfe02 100644
+index 8d9ebcb3..65aa1c4e 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -591,5 +591,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -607,5 +607,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
     public ItemStack ensureServerConversions() {
         return Bukkit.getServer().getItemFactory().ensureServerConversions(this);
     }
@ -51,5 +51,5 @@ index 44f3bec7d..9526cfe02 100644
     // Paper end
 }
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch
@ -1,4 +1,4 @@
-From 9bdc8d9de62d527ee067394e8b7d5bdd2afd3306 Mon Sep 17 00:00:00 2001
+From 99c1ecbc8bb08b1102844c2e06aff75e8e189876 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 000000000..b10176289
+index 00000000..b1017628
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
@@ -0,0 +1,117 @@
@ -131,5 +131,5 @@ index 000000000..b10176289
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch
+++ b/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch
@ -1,11 +1,11 @@
-From 1ba89d09eb2ddf73c278f597a2c93833fd558887 Mon Sep 17 00:00:00 2001
+From e955f61d6121d9145086bb3aefcd07f8d19a6505 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 11fbd0e0c..d4e74d292 100644
+index 11fbd0e0..d4e74d29 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;
@ -51,5 +51,5 @@ index 11fbd0e0c..d4e74d292 100644
     }
 }
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0065-LivingEntity-setKiller.patch
+++ b/Spigot-API-Patches/0065-LivingEntity-setKiller.patch
@ -1,11 +1,11 @@
-From 3217c90d3d100110a12a3c599087d1412fcd2807 Mon Sep 17 00:00:00 2001
+From 4b1878762d153ef4b7560fa69cc81fca1af5f7ff 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


 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 5697728ce..ffbf3d7a8 100644
+index f5969cad..7e8fc5b3 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -250,6 +250,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@ -25,5 +25,5 @@ index 5697728ce..ffbf3d7a8 100644
      * Adds the given {@link PotionEffect} to the living entity.
      * <p>
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch
+++ b/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch
@ -1,4 +1,4 @@
-From 61284d609548d572f43cd0342875b93feaefd295 Mon Sep 17 00:00:00 2001
+From d5fd96d447dd6f8d8fa433d18082329fea603982 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 223190054..bb2e55e97 100644
+index 22319005..bb2e55e9 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 223190054..bb2e55e97 100644
 
     /**
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
@ -1,4 +1,4 @@
-From 0a294869c703f3fc7f22f2752e20cedd85985c12 Mon Sep 17 00:00:00 2001
+From 349a9bf5d5d38cd62f2ed1df7e6524cb9900c6e2 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 a6567413..1179fd55 100644
+index 5c25ff12..a71015f4 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -109,6 +109,13 @@
@ -50,5 +50,5 @@ index febfec6e..79890c68 100644
      * Returns the name of the plugin.
      * <p>
 -- 
-2.24.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
+++ b/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
@ -1,4 +1,4 @@
-From 91259973846180ea7f731ae367e1f0f7f57a1782 Mon Sep 17 00:00:00 2001
+From d5c1e782cc2702e6378bd565345ed520567c6ce2 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
@ -116,5 +116,5 @@ index 7133be0a..9924780d 100644
     }
 }
 -- 
-2.25.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch
+++ b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch
@ -1,4 +1,4 @@
-From 3b3d6200514d4c75675a971831a3f303353cb1cd Mon Sep 17 00:00:00 2001
+From 391c8c2ec698ac64a495038842cbb2228c92e4bc 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 000000000..289a0d784
+index 00000000..289a0d78
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java
@@ -0,0 +1,106 @@
@ -117,5 +117,5 @@ index 000000000..289a0d784
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch
@ -1,4 +1,4 @@
-From 0895c179d69d82b098e9314d5c9e30b4c547091c Mon Sep 17 00:00:00 2001
+From acb615089a33d457c84bce216ba87649efe7e50d 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
@ -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 881ccce5..0a630843 100644
+index da36c8df..dbe53123 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 881ccce5..0a630843 100644
     /**
      * Gets the "friendly" name to display of this player. This may include
 -- 
-2.24.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch
@ -1,4 +1,4 @@
-From 3c961429504386861077423406b05410527fb380 Mon Sep 17 00:00:00 2001
+From 119d214a5cf12953f1d00e283e2c5768be6d9d03 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 000000000..2827a1002
+index 00000000..2827a100
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java
@@ -0,0 +1,137 @@
@ -148,5 +148,5 @@ index 000000000..2827a1002
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch
@ -1,4 +1,4 @@
-From 29c742337866538cb309776a8db6962465ee6661 Mon Sep 17 00:00:00 2001
+From aab556b666c1f5b415f1bd6fd6f3598964819f4e 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 ab6750c7a..af4ffada0 100644
+index ab6750c7..af4ffada 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 ab6750c7a..af4ffada0 100644
      * Returns the biome that this block resides in
      *
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch
+++ b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch
@ -1,4 +1,4 @@
-From fb6546240316a84266aada07ea0a0048e0b2a4ea Mon Sep 17 00:00:00 2001
+From 0cf763fb20fce10342ebec0cbcfa200d8b8a7a5b 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 000000000..619ed3716
+index 00000000..619ed371
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
@@ -0,0 +1,177 @@
@ -195,7 +195,7 @@ index 000000000..619ed3716
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
-index d1a9956a1..f96c4ba53 100644
+index d1a9956a..f96c4ba5 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 d1a9956a1..f96c4ba53 100644
 
     @Override
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch
+++ b/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch
@ -1,4 +1,4 @@
-From 6bfa8efdb8a6b1c98417d31611ab555466775816 Mon Sep 17 00:00:00 2001
+From e2ace04b7cc11c54b3a492d9a95a492b6aad8881 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 d74b3114f..d742c4058 100644
+index d74b3114..d742c405 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 d74b3114f..d742c4058 100644
     }
 
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index 68447fb8c..84062dd71 100644
+index 68447fb8..84062dd7 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 68447fb8c..84062dd71 100644
     }
 
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch
+++ b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch
@ -1,4 +1,4 @@
-From beaa74caee947fe0235be01e39e0a655c89b8502 Mon Sep 17 00:00:00 2001
+From 76a536dbdb61eb6fde0d55df507f92deb21e6a31 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 000000000..f7beb22d5
+index 00000000..f7beb22d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java
@@ -0,0 +1,80 @@
@ -92,5 +92,5 @@ index 000000000..f7beb22d5
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch
+++ b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch
@ -1,4 +1,4 @@
-From 49f9c641363fbbfd13423c3dbbf4fccdebdbe179 Mon Sep 17 00:00:00 2001
+From 72c291be9d0bb7daaf28bba76ff4968f10eb05df 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 000000000..0ce3e3977
+index 00000000..0ce3e397
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java
@@ -0,0 +1,87 @@
@ -101,5 +101,5 @@ index 000000000..0ce3e3977
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
@ -1,4 +1,4 @@
-From d668b4a2573d6df68b52462d67d209ab210d6506 Mon Sep 17 00:00:00 2001
+From af375fcae65a50a414f7c3b33c75d90d43edf6a9 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 0a630843..2bd1af78 100644
+index dbe53123..420aa906 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 0a630843..2bd1af78 100644
     /**
      * Gives the player the amount of experience levels specified. Levels can
 -- 
-2.24.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch
+++ b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch
@ -1,4 +1,4 @@
-From f964e9674f741b077eb95edddad85d9faf01e638 Mon Sep 17 00:00:00 2001
+From a532d8b8494cbfe850034f92ca644fc5f566c4fc 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 000000000..d5edde9cd
+index 00000000..d5edde9c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java
@@ -0,0 +1,104 @@
@ -125,5 +125,5 @@ index 000000000..d5edde9cd
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch
@ -1,4 +1,4 @@
-From fb78151fa68d3a9ab9cb2cf3659a02595560a03b Mon Sep 17 00:00:00 2001
+From 8bb61dab0ecdcf6e35175d10d9d2f8a003505894 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 000000000..112a0dbf5
+index 00000000..112a0dbf
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java
@@ -0,0 +1,64 @@
@ -79,5 +79,5 @@ index 000000000..112a0dbf5
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch
@ -1,4 +1,4 @@
-From cc8a78acc426282ecc2d2e90e0e031f1aa8ea82f Mon Sep 17 00:00:00 2001
+From cbdb821df0d1d148d04aeda9d0f83199e90c6f72 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 943d751fb..a6914f01e 100644
+index 943d751f..a6914f01 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 943d751fb..a6914f01e 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 35a392033..8b2465ea2 100644
+index 35a39203..8b2465ea 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 35a392033..8b2465ea2 100644
      * Gets the owner of the skull.
      *
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch
+++ b/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch
@ -1,4 +1,4 @@
-From ffffc2c2bd2a8c6302355b9eaa249cfe5021159b Mon Sep 17 00:00:00 2001
+From 49361ac9699332af1561efa4ef6e66a17aede152 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 000000000..71f36e9ca
+index 00000000..71f36e9c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java
@@ -0,0 +1,75 @@
@ -93,7 +93,7 @@ index 000000000..71f36e9ca
 +}
 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 000000000..021bc8631
+index 00000000..021bc863
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java
@@ -0,0 +1,77 @@
@ -175,5 +175,5 @@ index 000000000..021bc8631
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch
@ -1,4 +1,4 @@
-From 87ae4675cc8f9248300f7c41d06121b0dca856ee Mon Sep 17 00:00:00 2001
+From be3e65856f9a9b498ac9a1e8b9427d57e533af6d 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 000000000..bb8d7c959
+index 00000000..bb8d7c95
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java
@@ -0,0 +1,63 @@
@ -74,5 +74,5 @@ index 000000000..bb8d7c959
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch
@ -1,4 +1,4 @@
-From 430c19d7aa0eb0e2dbde634676b665d253669d61 Mon Sep 17 00:00:00 2001
+From 71ae7aea9324a132adf65042528ec5b02fe13c55 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 000000000..7e4acfff1
+index 00000000..7e4acfff
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java
@@ -0,0 +1,78 @@
@ -95,5 +95,5 @@ index 000000000..7e4acfff1
 +    void setMarker(boolean marker);
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0084-Optimize-Hoppers.patch
+++ b/Spigot-API-Patches/0084-Optimize-Hoppers.patch
@ -1,4 +1,4 @@
-From f504537606dd234d43075d20e9efac0e76bdb2d9 Mon Sep 17 00:00:00 2001
+From 7a9bf3167d5a6e2cc1a2fbd66f739f373ac54e9c 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 a8c48f5a4..04d4a83bf 100644
+index a8c48f5a..04d4a83b 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 a8c48f5a4..04d4a83bf 100644
     }
 
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch
@ -1,4 +1,4 @@
-From a94f5fca9e22f84e1ed553bb53228938c3a7e079 Mon Sep 17 00:00:00 2001
+From 3f28b2263c941869901fd442a8cdf09cc619e7b6 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 0c066bdfc..be436f8df 100644
+index 0c066bdf..be436f8d 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 0c066bdfc..be436f8df 100644
      */
     @Nullable
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@ -1,4 +1,4 @@
-From e37945a5eefd4246c9fc42b42daf2e9ce81d7f13 Mon Sep 17 00:00:00 2001
+From 1f100fb84d5576405ccbd83e5b9a9c08210ab689 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 c8384da69..6c09ea6c6 100644
+index c8384da6..6c09ea6c 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 c8384da69..6c09ea6c6 100644
         this.message = "";
         this.name = name;
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch
+++ b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch
@ -1,4 +1,4 @@
-From 05c90b3a666999ecf6ca0fdb824c8e4ef3f09528 Mon Sep 17 00:00:00 2001
+From 3a712b40988d06d9a8f42119c9eb6fc0968ae18d 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 000000000..0cc5dd573
+index 00000000..0cc5dd57
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
@@ -0,0 +1,323 @@
@ -337,7 +337,7 @@ index 000000000..0cc5dd573
 +}
 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 000000000..517d15238
+index 00000000..517d1523
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/StatusClient.java
@@ -0,0 +1,13 @@
@ -355,7 +355,7 @@ index 000000000..517d15238
 +
 +}
 diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java
-index 612958a33..bb4f7702c 100644
+index 612958a3..bb4f7702 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 612958a33..bb4f7702c 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
+++ b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
@ -1,4 +1,4 @@
-From 5e862d3cce62af29bd527af00a7b5f936f76b334 Mon Sep 17 00:00:00 2001
+From 5262b321dc03d1f58178d7b684ecad630cd041a4 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
@ -39,5 +39,5 @@ index 420aa906..083110cc 100644
 
     // Spigot start
 -- 
-2.25.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch
+++ b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch
@ -1,4 +1,4 @@
-From aeee26dcf880c0670381073a9ff2baf808ed7739 Mon Sep 17 00:00:00 2001
+From 3e7b82aceada63cd39219c5a3fdda878a4be6399 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
@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer

 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 161a714e5..0c519c412 100644
+index 161a714e..0c519c41 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -423,6 +423,20 @@ public final class Bukkit {
@ -34,7 +34,7 @@ index 161a714e5..0c519c412 100644
      * Gets the plugin manager for interfacing with plugins.
      *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 463724e40..8a76df524 100644
+index 463724e4..8a76df52 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -356,6 +356,18 @@ public interface Server extends PluginMessageRecipient {
@ -57,5 +57,5 @@ index 463724e40..8a76df524 100644
      * Gets the plugin manager for interfacing with plugins.
      *
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
+++ b/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
@ -1,4 +1,4 @@
-From 546e453739bd983de0706baf4ec72ac2665ba7d9 Mon Sep 17 00:00:00 2001
+From 6b0a919a4594ce2cfe55bedf3a7faecd0a266887 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 517d15238..ffda9f6a8 100644
+index 517d1523..ffda9f6a 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 517d15238..ffda9f6a8 100644
 +
 }
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch
@ -1,11 +1,11 @@
-From f695f6cd5a9ee8ca6406f67aed271f8d4288f496 Mon Sep 17 00:00:00 2001
+From 7b106928641e7ae0f15db3f9bbad7e9cff20dea2 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 5b5fb3034..cdbac95bb 100644
+index 5b5fb303..cdbac95b 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 5b5fb3034..cdbac95bb 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
+++ b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
@ -1,4 +1,4 @@
-From 9cced81315e6ffdc7f528dae1e86441c53025428 Mon Sep 17 00:00:00 2001
+From 10af44a728883c15bac804518f6f98cf91194944 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
@ -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 f9a3a3e5..75bbbefd 100644
+index 083110cc..2c6ff39e 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 f9a3a3e5..75bbbefd 100644
     /**
      * Sends an Action Bar message to the client.
 -- 
-2.24.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0093-EndermanEscapeEvent.patch
+++ b/Spigot-API-Patches/0093-EndermanEscapeEvent.patch
@ -1,4 +1,4 @@
-From 26947b3096d22303635f386434624e373a26bef6 Mon Sep 17 00:00:00 2001
+From 933718c31587aca9f00374ee29bb61c0b844953f 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 000000000..806112a8b
+index 00000000..806112a8
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java
@@ -0,0 +1,87 @@
@ -101,5 +101,5 @@ index 000000000..806112a8b
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch
+++ b/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch
@ -1,4 +1,4 @@
-From 0a6883ae1317e0b1348aa136248e692ef3f8f928 Mon Sep 17 00:00:00 2001
+From 22b8e1bb9689bb3b947d2129d699757c7bac34dd 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 bb325d9c8..821c690f8 100644
+index bb325d9c..821c690f 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 bb325d9c8..821c690f8 100644
      * Gets the id and data of the block that the Enderman is carrying.
      *
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
+++ b/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
@ -1,4 +1,4 @@
-From 8086435d3bbd0275e9ac6bf4e5d5492e8646e3f7 Mon Sep 17 00:00:00 2001
+From a63e50797c651f9140ab1e0e9fa7a928649d5eab 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 3cd4bff1..36ec897f 100644
+index 220420ed..bd050368 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -1,6 +1,9 @@
@ -19,7 +19,7 @@ index 3cd4bff1..36ec897f 100644
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
-@@ -586,6 +589,256 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -583,6 +586,256 @@ public interface World extends PluginMessageRecipient, Metadatable {
     @NotNull
     public Collection<Entity> getEntitiesByClasses(@NotNull Class<?>... classes);
 
@ -291,5 +291,5 @@ index 6c09ea6c..76c4a1a6 100644
      */
     public void setPlayerProfile(@NotNull PlayerProfile profile) {
 -- 
-2.22.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch
+++ b/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch
@ -1,11 +1,11 @@
-From 1c6f930626a0a32fb86db642a2f45cf7dd89e8f1 Mon Sep 17 00:00:00 2001
+From 2e924d63585468de921954ade22acf335dd0d643 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 44e3bca61..6021e6729 100644
+index 0939a807..6c8b8edd 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 44e3bca61..6021e6729 100644
     public boolean equals(Object obj) {
         if (obj == null) {
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
@ -1,4 +1,4 @@
-From dd65b6e6184accfc01cecb26bc44733955544382 Mon Sep 17 00:00:00 2001
+From 17e492080ad5240dbe98e9983b1ae2b96979ad0d 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 000000000..06f1602f5
+index 00000000..06f1602f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
@@ -0,0 +1,478 @@
@ -493,7 +493,7 @@ index 000000000..06f1602f5
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 49467ac70..d2ceb07c7 100644
+index 49467ac7..d2ceb07c 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,10 +515,10 @@ index 49467ac70..d2ceb07c7 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 b653c695a..548d6d683 100644
+index bd050368..0b357583 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2286,7 +2286,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2283,7 +2283,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
      *             the type of this depends on {@link Particle#getDataType()}
      * @param <T> Type
      */
@ -578,5 +578,5 @@ index b653c695a..548d6d683 100644
     /**
      * Spawns the particle (the number of times specified by count)
 -- 
-2.24.1
+2.25.0.windows.1

--- a/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch
+++ b/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch
@ -1,4 +1,4 @@
-From 6106d1cea7857eaef76610a6bebbab623495d8f1 Mon Sep 17 00:00:00 2001
+From c8c18603ed87388a020dd699aa5c7ab3df054816 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 000000000..f530a3d93
+index 00000000..f530a3d9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
@@ -0,0 +1,101 @@
@ -115,5 +115,5 @@ index 000000000..f530a3d93
 +    }
 +}
 -- 
-2.21.0
+2.25.0.windows.1

--- a/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch
+++ b/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch
@ -1,4 +1,4 @@
-From 14c718e37affff0ccd3d443a988c9d38c332e1ec Mon Sep 17 00:00:00 2001
+From bc1c2155484fd5942bac31d5c13cd77777245af1 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
@ -140,5 +140,5 @@ index 06b6724f..bc7bf6a3 100644
         }
     }
 -- 
-2.22.0
+2.25.0.windows.1

--- a/Show More
+++ b/Show More