Updated Upstream (CraftBukkit)

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

CraftBukkit Changes:
17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI
0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work
bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason

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

@@ -1,4 +1,4 @@
-From 6c376546c6b7ad08a3b414f705e54015f4b0200f Mon Sep 17 00:00:00 2001
+From b3e029c256e793171b8e2944cf70605421487858 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

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

@@ -1,4 +1,4 @@
-From ba48d41f6fb7072f60e80b0bf683b3f1650b2aeb Mon Sep 17 00:00:00 2001
+From 12e0d1a8dbc8180bd231739a3970f6d4faea9329 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 69866193..3dac66d3 100644
+index 2a2abac96..81851a293 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -50,6 +50,12 @@

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

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

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

@@ -1,4 +1,4 @@
-From 64d9488334e3b3e421967247c570baeaff171002 Mon Sep 17 00:00:00 2001
+From d8cc95839c35574bfdfc10f178092c6c299bdc96 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

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

@@ -1,4 +1,4 @@
-From ff975211888a6278bff7825a05c0570c40a5572d Mon Sep 17 00:00:00 2001
+From 457706162404fe59372fb8faa3240e9cd5d5eb92 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

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

@@ -1,11 +1,11 @@
-From 3dc036320c5c47452a57756953fb08f509c98008 Mon Sep 17 00:00:00 2001
+From 2add78cba99e477862cf447e11d02e4df0e5795b 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 940c643d..9f87f333 100644
+index 940c643df..9f87f333e 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 940c643d..9f87f333 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 c197e381..e1dfa92a 100644
+index c197e3811..e1dfa92a9 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 {

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

@@ -1,11 +1,11 @@
-From 8afe5fdd42c40fbe3abb9fbae80e154fd896f4d7 Mon Sep 17 00:00:00 2001
+From 13cf66cb0e08d0cfd3698a607cb0de052992b480 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 17:50:31 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 699c31d9..c8439d64 100644
+index 699c31d97..c8439d644 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -606,4 +606,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -26,7 +26,7 @@ index 699c31d9..c8439d64 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
-index 64f9d3fd..14cb0d77 100644
+index 64f9d3fd8..14cb0d770 100644
 --- a/src/main/java/org/bukkit/entity/FallingBlock.java
 +++ b/src/main/java/org/bukkit/entity/FallingBlock.java
 @@ -54,4 +54,15 @@ public interface FallingBlock extends Entity {
@@ -46,7 +46,7 @@ index 64f9d3fd..14cb0d77 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java
-index 5a878932..3022b4a2 100644
+index 5a8789324..3022b4a27 100644
 --- a/src/main/java/org/bukkit/entity/TNTPrimed.java
 +++ b/src/main/java/org/bukkit/entity/TNTPrimed.java
 @@ -39,4 +39,15 @@ public interface TNTPrimed extends Explosive {

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

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

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

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

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

@@ -1,4 +1,4 @@
-From 18b67ec34070205553c5d37eb7fa10a49f8326e4 Mon Sep 17 00:00:00 2001
+From be074334b42c57876a13779e7d33b74087bdf90a 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

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

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

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

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

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

@@ -1,11 +1,11 @@
-From d52d23e3b9da885c5a0209ad2a8a00afb2d78b6c Mon Sep 17 00:00:00 2001
+From 70633c7b9d25cdbfb631d999b307ef447a1ed579 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 82e379d1..12601db6 100644
+index 82e379d16..12601db68 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 {

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

@@ -1,11 +1,11 @@
-From 3a982ed3a1fb226be1a1a7cc29f0aa77a91e6c8b Mon Sep 17 00:00:00 2001
+From 9922d188f075c2604ee0b1ccbebba38b3c11a2ea 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 9f87f333..63e48ef3 100644
+index 9f87f333e..63e48ef3f 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 9f87f333..63e48ef3 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 e1dfa92a..87300a5d 100644
+index e1dfa92a9..87300a5df 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 {

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

@@ -1,4 +1,4 @@
-From b4534cdb384942daeea67ad698853dfd6749381f Mon Sep 17 00:00:00 2001
+From 305a20b026e6e844fe28e5c2b33643f41a836f52 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 19:54:32 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@@ -6,7 +6,7 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
 Change Javadoc to be accurate
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e4e1c980..3c76d5a8 100644
+index 63e48ef3f..b92304e9b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -274,6 +274,26 @@ public final class Bukkit {
@@ -37,7 +37,7 @@ index e4e1c980..3c76d5a8 100644
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f0850919..3359434b 100644
+index 87300a5df..d35d2deff 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -225,6 +225,26 @@ public interface Server extends PluginMessageRecipient {
@@ -68,7 +68,7 @@ index f0850919..3359434b 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 145c78c2..bc4ec3f2 100644
+index 338d47205..8b5340a1f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -421,6 +421,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

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

@@ -1,4 +1,4 @@
-From 930766c10632a6483c6a44cfc9c08564571e880a Mon Sep 17 00:00:00 2001
+From 1a8f1a783d9615e8e45ff89fa5b88d6c72619992 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 29 Feb 2016 20:02:40 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -6,7 +6,7 @@ Subject: [PATCH] Player Tab List and Title APIs
 
 diff --git a/src/main/java/com/destroystokyo/paper/Title.java b/src/main/java/com/destroystokyo/paper/Title.java
 new file mode 100644
-index 00000000..4fe18540
+index 000000000..4fe18540f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/Title.java
 @@ -0,0 +1,373 @@
@@ -384,7 +384,7 @@ index 00000000..4fe18540
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index bc4ec3f2..abe00d72 100644
+index 8b5340a1f..0f7f25eb4 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1,6 +1,8 @@

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

@@ -1,4 +1,4 @@
-From 4b0e39e1270afcb0a08bc1d74935aa363ee79c56 Mon Sep 17 00:00:00 2001
+From a518f00b42bda3ba162cac421b441dd55d594336 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:24:35 -0600
 Subject: [PATCH] Add exception reporting event
@@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
 new file mode 100644
-index 00000000..d3b00f74
+index 000000000..d3b00f741
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
 @@ -0,0 +1,41 @@
@@ -53,7 +53,7 @@ index 00000000..d3b00f74
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
 new file mode 100644
-index 00000000..6fb39af0
+index 000000000..6fb39af04
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
 @@ -0,0 +1,64 @@
@@ -123,7 +123,7 @@ index 00000000..6fb39af0
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
 new file mode 100644
-index 00000000..410b2413
+index 000000000..410b24139
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
 @@ -0,0 +1,52 @@
@@ -181,7 +181,7 @@ index 00000000..410b2413
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerException.java
 new file mode 100644
-index 00000000..c06ea394
+index 000000000..c06ea3942
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerException.java
 @@ -0,0 +1,23 @@
@@ -210,7 +210,7 @@ index 00000000..c06ea394
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
 new file mode 100644
-index 00000000..e762ed0d
+index 000000000..e762ed0db
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
 @@ -0,0 +1,35 @@
@@ -251,7 +251,7 @@ index 00000000..e762ed0d
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
 new file mode 100644
-index 00000000..f016ba3b
+index 000000000..f016ba3b1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
 @@ -0,0 +1,20 @@
@@ -278,7 +278,7 @@ index 00000000..f016ba3b
 \ No newline at end of file
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
 new file mode 100644
-index 00000000..6defac28
+index 000000000..6defac287
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
 @@ -0,0 +1,38 @@
@@ -322,7 +322,7 @@ index 00000000..6defac28
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
 new file mode 100644
-index 00000000..89e13252
+index 000000000..89e132525
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
 @@ -0,0 +1,64 @@
@@ -392,7 +392,7 @@ index 00000000..89e13252
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
 new file mode 100644
-index 00000000..2d0b2d4a
+index 000000000..2d0b2d4a9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
 @@ -0,0 +1,37 @@
@@ -435,7 +435,7 @@ index 00000000..2d0b2d4a
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
 new file mode 100644
-index 00000000..5582999f
+index 000000000..5582999fe
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
 @@ -0,0 +1,22 @@
@@ -462,7 +462,7 @@ index 00000000..5582999f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index f020cb04..adfc7aae 100644
+index f020cb04e..adfc7aae2 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 @@ -8,6 +8,10 @@ import java.util.HashMap;
@@ -504,7 +504,7 @@ index f020cb04..adfc7aae 100644
      }
  
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 78a2d2f8..aa0c809a 100644
+index 78a2d2f8d..aa0c809a6 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -19,6 +19,10 @@ import java.util.WeakHashMap;

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

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

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

@@ -1,11 +1,11 @@
-From 3060ab89a8aad75f91754407cbe69c61f37d984d Mon Sep 17 00:00:00 2001
+From c774f0ab274852a7b7c425304896283de184d7dc 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 74816c63..be11d52a 100644
+index 74816c63f..be11d52a0 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 {

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

@@ -1,4 +1,4 @@
-From f133052d9aa3253191db6c03132f36d2a6c5a553 Mon Sep 17 00:00:00 2001
+From a82cad370c048e4abeadc1952efd1dcae58d1a3a 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

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

@@ -1,4 +1,4 @@
-From bd0e6228f445ce1b3e6dde9cba621e132eb3b4d2 Mon Sep 17 00:00:00 2001
+From 1d0ae007303eff42b8ff0bc7f0660beb0cc1b791 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

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

@@ -1,4 +1,4 @@
-From 39aa81607372199ad89fe66301dc008dc4326e30 Mon Sep 17 00:00:00 2001
+From 32350eec467ac2afa26baa73be6e7f41fbdad443 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 13:20:33 -0700
 Subject: [PATCH] Use ASM for event executors.
@@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/pom.xml b/pom.xml
-index 3dac66d3..aceb6bbb 100644
+index 81851a293..94173d328 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -129,6 +129,17 @@
@@ -29,7 +29,7 @@ index 3dac66d3..aceb6bbb 100644
      <build>
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 new file mode 100644
-index 00000000..5b28e9b1
+index 000000000..5b28e9b1d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 @@ -0,0 +1,42 @@
@@ -77,7 +77,7 @@ index 00000000..5b28e9b1
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
 new file mode 100644
-index 00000000..c8367242
+index 000000000..c83672427
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
 @@ -0,0 +1,43 @@
@@ -126,7 +126,7 @@ index 00000000..c8367242
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
 new file mode 100644
-index 00000000..b6e7d8ee
+index 000000000..b6e7d8ee8
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
 @@ -0,0 +1,47 @@
@@ -179,7 +179,7 @@ index 00000000..b6e7d8ee
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
 new file mode 100644
-index 00000000..beed9e6e
+index 000000000..beed9e6e0
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
 @@ -0,0 +1,35 @@
@@ -220,7 +220,7 @@ index 00000000..beed9e6e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
 new file mode 100644
-index 00000000..ac99477e
+index 000000000..ac99477e9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
 @@ -0,0 +1,66 @@
@@ -292,7 +292,7 @@ index 00000000..ac99477e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
 new file mode 100644
-index 00000000..72e48e8e
+index 000000000..72e48e8ef
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
 @@ -0,0 +1,35 @@
@@ -332,7 +332,7 @@ index 00000000..72e48e8e
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java
-index a850f078..9026e108 100644
+index a850f0780..9026e108c 100644
 --- a/src/main/java/org/bukkit/plugin/EventExecutor.java
 +++ b/src/main/java/org/bukkit/plugin/EventExecutor.java
 @@ -5,9 +5,75 @@ import org.bukkit.event.EventException;
@@ -412,7 +412,7 @@ index a850f078..9026e108 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 12601db6..06b6724f 100644
+index 12601db68..06b6724fa 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -301,21 +301,7 @@ public final class JavaPluginLoader implements PluginLoader {

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

@@ -1,4 +1,4 @@
-From eca2d156a9ab87ab92228e8ae93fa65cc65cab02 Mon Sep 17 00:00:00 2001
+From 0272169024ee505ee1592d5ecccc89b758d444b7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 19 May 2013 20:36:58 -0400
 Subject: [PATCH] Add a call helper to Event
@@ -6,7 +6,7 @@ Subject: [PATCH] Add a call helper to Event
 Reduces diff in Server patches
 
 diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java
-index 18d0636b..8ec56cd6 100644
+index 18d0636b7..8ec56cd6b 100644
 --- a/src/main/java/org/bukkit/event/Event.java
 +++ b/src/main/java/org/bukkit/event/Event.java
 @@ -35,6 +35,22 @@ public abstract class Event {

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

@@ -1,4 +1,4 @@
-From 9de592f68b7fb6a7f83c8873216da8a771784ebd Mon Sep 17 00:00:00 2001
+From 03177fc70901119e30dc8cf1c37d19ea05ac7361 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 22 Jul 2015 18:50:41 -0400
 Subject: [PATCH] Add sender name to commands.yml replacement
@@ -7,7 +7,7 @@ This allows you to use $sender in commands.yml definitions to make
 commands that auto target self.
 
 diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
-index a6ad94ef..9d4f553c 100644
+index a6ad94ef9..9d4f553c0 100644
 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 @@ -1,6 +1,9 @@

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

@@ -1,4 +1,4 @@
-From 6df33d108c315e2684b89eaed4eb335c049684a3 Mon Sep 17 00:00:00 2001
+From 019f194ec956a3e9c97d500d066b95b5c48928dc Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:28:07 -0400
 Subject: [PATCH] Add command to reload permissions.yml and require confirm to
@@ -6,7 +6,7 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b92304e9..a3682b29 100644
+index b92304e9b..a3682b291 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1516,6 +1516,13 @@ public final class Bukkit {
@@ -24,7 +24,7 @@ index b92304e9..a3682b29 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d35d2def..18faba0e 100644
+index d35d2deff..18faba0e2 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1338,4 +1338,6 @@ public interface Server extends PluginMessageRecipient {
@@ -35,7 +35,7 @@ index d35d2def..18faba0e 100644
 +    void reloadPermissions(); // Paper
  }
 diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-index 50cc311b..c62da413 100644
+index 50cc311be..c62da4131 100644
 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
 @@ -13,15 +13,35 @@ public class ReloadCommand extends BukkitCommand {
@@ -85,7 +85,7 @@ index 50cc311b..c62da413 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index aa0c809a..4cbec1f1 100644
+index aa0c809a6..4cbec1f11 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -808,4 +808,13 @@ public final class SimplePluginManager implements PluginManager {

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

@@ -1,11 +1,11 @@
-From d00529ea428e96ea97364b8c2bc02c1681208fb6 Mon Sep 17 00:00:00 2001
+From 95131916a5f5d93f350b12a019630976d2d25d0f Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:05:21 -0400
 Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
-index c2793f3e..373f4b5b 100644
+index c2793f3ef..373f4b5b5 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
 @@ -22,6 +22,7 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {

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

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

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

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

Spigot-API-Patches/0029-EntityPathfindEvent.patch

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

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

@@ -1,4 +1,4 @@
-From e19f0490d85cb7478d10caf867592ab896f275ee Mon Sep 17 00:00:00 2001
+From 0508f80da3da659a490dc6f3d1ee7e07ff5abcd0 Mon Sep 17 00:00:00 2001
 From: crast <contact@jamescrasta.com>
 Date: Sat, 1 Jun 2013 13:52:30 -0600
 Subject: [PATCH] Reduce thread synchronization in MetadataStoreBase
@@ -8,7 +8,7 @@ limited synchronized portions to allow much higher concurrency in
 MetadataStore as well as far less locking, especially on reads
 
 diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
-index 02795349..b3d85d97 100644
+index 027953499..b3d85d973 100644
 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
 +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
 @@ -12,7 +12,7 @@ import org.bukkit.plugin.Plugin;

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

@@ -1,4 +1,4 @@
-From 28da1a3671afc7a8d288c6fb2a4bba46fb825c3a Mon Sep 17 00:00:00 2001
+From 0a6d869f3c9a97e13107d64099f27b73414799ab 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 b3d85d97..0e8cd85c 100644
+index b3d85d973..0e8cd85c7 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;

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

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

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

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

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

@@ -1,11 +1,11 @@
-From 0599f023061d1ef63c069dccc2477f24134e7ebc Mon Sep 17 00:00:00 2001
+From f60334f986fa97b67906ca99d7f655a4b757e8b7 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 4 Mar 2016 03:13:18 -0500
 Subject: [PATCH] Arrow pickup rule API
 
 
 diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java
-index 4460f6c9..a1990fef 100644
+index 4460f6c9e..a1990fef2 100644
 --- a/src/main/java/org/bukkit/entity/AbstractArrow.java
 +++ b/src/main/java/org/bukkit/entity/AbstractArrow.java
 @@ -111,4 +111,38 @@ public interface AbstractArrow extends Projectile {

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

@@ -1,11 +1,11 @@
-From 4fe67c4add046aa9e0f5a4b7f41b96f5061c5d61 Mon Sep 17 00:00:00 2001
+From 8940e7d1f71a344b76954326e6836a9882f943cf Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
-index 8feb6698..d51d2ec1 100644
+index 8feb6698f..d51d2ec1d 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
 @@ -13,12 +13,31 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-From 8e06e63bd85cca024c4e38e35741ddac6f809b48 Mon Sep 17 00:00:00 2001
+From 68b57fb41e3bae33ce18fe38d6aeb4a5e00b1b1e 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 a3682b29..a0a8b540 100644
+index a3682b291..a0a8b5408 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 a3682b29..a0a8b540 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 18faba0e..d20e044d 100644
+index 18faba0e2..d20e044dd 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 18faba0e..d20e044d 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 bd2c7a69..864c263b 100644
+index bd2c7a696..864c263bb 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 bd2c7a69..864c263b 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index adfc7aae..460fda05 100644
+index adfc7aae2..460fda05a 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 adfc7aae..460fda05 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 c62da413..af8ab73f 100644
+index c62da4131..af8ab73fe 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 {

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

@@ -1,11 +1,11 @@
-From dfd138e944f9160fc420ca7166f17938eeb60b78 Mon Sep 17 00:00:00 2001
+From 4ae78dd5dd3aa2a87adbe810a834661deeae82e2 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:47:08 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
-index c99c9281..7c340f53 100644
+index c99c9281e..7c340f539 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
 @@ -1,21 +1,43 @@

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

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

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

@@ -1,4 +1,4 @@
-From fd66e162c93936eea057dc6cbed1ae4d82f93a0e Mon Sep 17 00:00:00 2001
+From 8c89ef7105e1fdd8f531ab2c48fd74d7fb470d96 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

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

@@ -1,11 +1,11 @@
-From daf8f6bd192c9dcbf227bc01c9a323fd59e254b8 Mon Sep 17 00:00:00 2001
+From bfa947da63d3e584332db78f37e08671ae142d48 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 d04e52fb..387d04e5 100644
+index d04e52fbe..387d04e5b 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 {

Spigot-API-Patches/0044-IllegalPacketEvent.patch

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

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

@@ -1,4 +1,4 @@
-From fee18582db9f6a66e6476a7e2ff900e082ac1659 Mon Sep 17 00:00:00 2001
+From 85c132f14e2c2617018124b1bd4e6bbf01202967 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:55 -0500
 Subject: [PATCH] Fireworks API's
@@ -7,7 +7,7 @@ Get the Entity being boosted
 Get the firework launcher
 
 diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java
-index 1c55f033..7df26cf7 100644
+index 1c55f0338..7df26cf7f 100644
 --- a/src/main/java/org/bukkit/entity/Firework.java
 +++ b/src/main/java/org/bukkit/entity/Firework.java
 @@ -3,6 +3,9 @@ package org.bukkit.entity;

Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch

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

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

@@ -1,4 +1,4 @@
-From 60957aa5e1df382fd211eaaaa2fb9d063c499d75 Mon Sep 17 00:00:00 2001
+From c4d70f57de38f0309bdc520b81d71e8321ae9cbd 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 17b4f38d..80608e7a 100644
+index ac7ef3c8b..d1d64fb60 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -38,6 +38,33 @@ import org.jetbrains.annotations.Nullable;

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

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

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

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

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

@@ -1,4 +1,4 @@
-From 7070e4f10451715c06c1766937634f1b7f4ab98d Mon Sep 17 00:00:00 2001
+From 7ffd449da31280a2729fff793273fdd0ec2efb99 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 a0a8b540..b5b77b2d 100644
+index a0a8b5408..b5b77b2d8 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 a0a8b540..b5b77b2d 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d20e044d..103897fb 100644
+index d20e044dd..103897fbe 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 d20e044d..103897fb 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java
-index 7f153000..1e126487 100644
+index 7f153000e..1e126487d 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

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

@@ -1,4 +1,4 @@
-From f23f0d063ab357133aaa4eb44a040d87f50ba7eb Mon Sep 17 00:00:00 2001
+From ffae0ecb3086b83508fbe0c909da482a0befe9a1 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

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

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

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

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

Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch

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

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

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

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

@@ -1,4 +1,4 @@
-From 70559f747cdfd82b811d7b2e356669afc267f9e7 Mon Sep 17 00:00:00 2001
+From 5c0def0c0921aa93f2a86e44d159abf7ab8db9f8 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 00000000..476151d2
+index 000000000..476151d2a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
 @@ -0,0 +1,145 @@
@@ -158,7 +158,7 @@ index 00000000..476151d2
 +}
 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 00000000..7b3b6ef5
+index 000000000..7b3b6ef53
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
 @@ -0,0 +1,72 @@
@@ -235,7 +235,7 @@ index 00000000..7b3b6ef5
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b5b77b2d..161a714e 100644
+index b5b77b2d8..161a714e5 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 b5b77b2d..161a714e 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 103897fb..463724e4 100644
+index 103897fbe..463724e40 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 {

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

@@ -1,11 +1,11 @@
-From eba649f74129e9b960548a5f2bff478f385e979b Mon Sep 17 00:00:00 2001
+From 8351f7cc785ea8e94ba98bc60df0897feb7f2058 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:04:51 -0400
 Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 6277f392..5b5fb303 100644
+index 6277f3928..5b5fb3034 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -324,6 +324,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder

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

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

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

@@ -1,11 +1,11 @@
-From 2fca0ae8869cce83cf6c22fc95e0d6b8a9a9f17a Mon Sep 17 00:00:00 2001
+From 29ccdf625a3c47d48b473656b5230c477d9574c9 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index c8439d64..35d0909b 100644
+index c8439d644..35d0909b1 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -617,5 +617,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent

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

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

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

@@ -1,4 +1,4 @@
-From 005245b4911271b4f13791ff70746dc694f9b531 Mon Sep 17 00:00:00 2001
+From a1e4c9a771b5827464c1e538b2452ed09116bac1 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 cbcbe8c8..8e602cf5 100644
+index 4ff149fd9..bb3f7cdc1 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -141,4 +141,17 @@ public interface ItemFactory {
@@ -29,7 +29,7 @@ index cbcbe8c8..8e602cf5 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index bab86d80..44f3bec7 100644
+index bab86d804..44f3bec7d 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 {

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

@@ -1,4 +1,4 @@
-From 5fee301aedb1cbdf582295f335c237a142e82865 Mon Sep 17 00:00:00 2001
+From 7061ed771605cf3d3692e26673ad86570b054d26 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 8e602cf5..dca77bba 100644
+index bb3f7cdc1..3cada3487 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -153,5 +153,16 @@ public interface ItemFactory {
@@ -29,7 +29,7 @@ index 8e602cf5..dca77bba 100644
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 44f3bec7..9526cfe0 100644
+index 44f3bec7d..9526cfe02 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 {

Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch

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

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

@@ -1,11 +1,11 @@
-From 7e6884097c480972ee63619950c2f45be6042865 Mon Sep 17 00:00:00 2001
+From 0999a170395516445aa9da71a80e50546e463d7a 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 11fbd0e0..d4e74d29 100644
+index 11fbd0e0c..d4e74d292 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;

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

@@ -1,11 +1,11 @@
-From 7f8b71c8dd1d8cd60348ee5bedcb155a6ed92c55 Mon Sep 17 00:00:00 2001
+From ee435e2da2a015c2e42cb98b9739b9749d3467c1 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 2a4e4cb39..ba7881a27 100644
+index 5697728ce..ffbf3d7a8 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

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

@@ -1,4 +1,4 @@
-From b733f821905e9d3385d6e20ff17a6a07e652741a Mon Sep 17 00:00:00 2001
+From 8c3baea68032f5add44014796c416d5ffd9e892e Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:14:13 +0200
 Subject: [PATCH] Handle plugin prefixes in implementation logging
@@ -17,7 +17,7 @@ The implementation should handle plugin prefixes by displaying
 logger names when appropriate.
 
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index 22319005..bb2e55e9 100644
+index 223190054..bb2e55e97 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 @@ -42,7 +42,7 @@ public abstract class JavaPlugin extends PluginBase {

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

@@ -1,4 +1,4 @@
-From f7a220fa4c20104eba993f5b963526ae0b91cdaa Mon Sep 17 00:00:00 2001
+From b80b487f6e0b342dd8e92c51bf0c30654c4d961c 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 aceb6bbb..dbbb5c72 100644
+index 94173d328..4b8334d62 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -110,6 +110,13 @@
@@ -32,7 +32,7 @@ index aceb6bbb..dbbb5c72 100644
          <dependency>
              <groupId>junit</groupId>
 diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java
-index febfec6e..79890c68 100644
+index febfec6ef..79890c68f 100644
 --- a/src/main/java/org/bukkit/plugin/Plugin.java
 +++ b/src/main/java/org/bukkit/plugin/Plugin.java
 @@ -166,6 +166,13 @@ public interface Plugin extends TabExecutor {

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

@@ -1,4 +1,4 @@
-From 8cc0cf9092f9b58e9f7cf6f1cd8b5bda990b7d3d Mon Sep 17 00:00:00 2001
+From 9bd539b6bfd407871c33f53045ef9754385250e2 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 19:41:20 +0200
 Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin
@@ -14,7 +14,7 @@ parent of the plugin logger to avoid this.
 
 diff --git a/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java
 new file mode 100644
-index 00000000..76f2cb9c
+index 000000000..76f2cb9cd
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java
 @@ -0,0 +1,41 @@
@@ -60,7 +60,7 @@ index 00000000..76f2cb9c
 +
 +}
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index bb2e55e9..04fa3991 100644
+index bb2e55e97..04fa3991f 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 @@ -42,7 +42,7 @@ public abstract class JavaPlugin extends PluginBase {
@@ -87,7 +87,7 @@ index bb2e55e9..04fa3991 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index b859796b..6f39f571 100644
+index b859796b4..6f39f571d 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -37,6 +37,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot

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

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

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

@@ -1,4 +1,4 @@
-From f0f9d92355cf99f298ffb63c693b6c9b410052ed Mon Sep 17 00:00:00 2001
+From daca7640762ec77783db4485f7e214f6582bb629 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:44:42 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -11,7 +11,7 @@ Add a NetworkClient interface that provides access to:
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/NetworkClient.java b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
 new file mode 100644
-index 00000000..7b2af1bd
+index 000000000..7b2af1bd7
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
 @@ -0,0 +1,41 @@
@@ -57,7 +57,7 @@ index 00000000..7b2af1bd
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c21785d5..247ed072 100644
+index 290b9d75d..d8cc7d5db 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;

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

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

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

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

Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch

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

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

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

Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch

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

Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch

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

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

@@ -1,4 +1,4 @@
-From d9f8be3f0027a03340b60ccde44a253048eceeb7 Mon Sep 17 00:00:00 2001
+From 2997e482c0c100a5782713ce6aeec2d7af8c0ffc 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 b90e211a..df1d3c78 100644
+index d8cc7d5db..7d6cfb05d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -947,12 +947,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch

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

Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch

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

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

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

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

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

Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch

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

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

@@ -1,4 +1,4 @@
-From 11d6f5499f0a3d3c885d5de311c57ab98403309e Mon Sep 17 00:00:00 2001
+From 46b764af9db79c78d639d08e797c28dcd93ec981 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:06:24 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
@@ -12,7 +12,7 @@ starting point for future additions in this area.
 
 diff --git a/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java
 new file mode 100644
-index 00000000..7e4acfff
+index 000000000..7e4acfff1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java
 @@ -0,0 +1,78 @@

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

@@ -1,4 +1,4 @@
-From a8182f37635d55f5c7c37fed994fbbebe10aafe4 Mon Sep 17 00:00:00 2001
+From 9a156e6947b5c9c31a983dcee2670e4bc7c3aee3 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 2bb57d23..f0a16d3c 100644
+index a8c48f5a4..04d4a83bf 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
 @@ -31,6 +31,8 @@ public class InventoryMoveItemEvent extends Event implements Cancellable {

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-From f31c5a5d3b3ac8b24e723d53ddee127d6f6260be Mon Sep 17 00:00:00 2001
+From 9b80b5d016ea9bb1d0f3bf3ae87bb37da03858dc 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

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

@@ -1,4 +1,4 @@
-From 9d6cb9777a68d1b778b91e9b4bec65e489b00096 Mon Sep 17 00:00:00 2001
+From 055c2692f3638b4dde69db0813f2a80a6933ce5b 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 24b761fe..de42be5b 100644
+index 161a714e5..0c519c412 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 24b761fe..de42be5b 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 9b767d7c..9c92517b 100644
+index 463724e40..8a76df524 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 {

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

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

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

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

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

@@ -1,4 +1,4 @@
-From a1b55ca0684c1e96cb4416abf7f5531e2c20c2f0 Mon Sep 17 00:00:00 2001
+From a685bd4c9220dc3c52cefaae61ea2b595a6085a0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Apr 2018 10:28:50 -0400
 Subject: [PATCH] Add Ban Methods to Player Objects
@@ -8,7 +8,7 @@ Allows a more logical API for banning players.
 player.banPlayer("Breaking the rules");
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index ffc8ad37..222a9a7b 100644
+index ffc8ad373..222a9a7bf 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
 @@ -44,6 +44,61 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
@@ -74,7 +74,7 @@ index ffc8ad37..222a9a7b 100644
      /**
       * Checks if this player is whitelisted or not
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index ff799ac7..32dc1f86 100644
+index ff799ac78..32dc1f868 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1,10 +1,15 @@

Spigot-API-Patches/0093-EndermanEscapeEvent.patch

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

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

@@ -1,4 +1,4 @@
-From 2a517ba291f4bce720c9c721a8a9a350741d6e80 Mon Sep 17 00:00:00 2001
+From 7d86f2a56d32bf62666299cbd999d07666fdc7c0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:29:15 -0400
 Subject: [PATCH] Enderman.teleportRandomly()
@@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
 Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
 
 diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java
-index bb325d9c..821c690f 100644
+index bb325d9c8..821c690f8 100644
 --- a/src/main/java/org/bukkit/entity/Enderman.java
 +++ b/src/main/java/org/bukkit/entity/Enderman.java
 @@ -10,6 +10,17 @@ import org.jetbrains.annotations.Nullable;

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

@@ -1,4 +1,4 @@
-From 69bf5e553110fa957385964199ece616895b9469 Mon Sep 17 00:00:00 2001
+From c647ff2d1ed9575d465edff26822a70319491c90 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 2fe46faf..e1e674ba 100644
+index 2fe46faf0..e1e674bab 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1,6 +1,9 @@
@@ -277,7 +277,7 @@ index 2fe46faf..e1e674ba 100644
       * Get a list of all players in this World
       *
 diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index 6c09ea6c..76c4a1a6 100644
+index 6c09ea6c6..76c4a1a6e 100644
 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 @@ -42,8 +42,7 @@ public class AsyncPlayerPreLoginEvent extends Event {

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

@@ -1,11 +1,11 @@
-From 947a4656a70657d309ba4c02c36a3b5277d5d4c6 Mon Sep 17 00:00:00 2001
+From 731d3b535ac7624e8ac1e601d3b9ee718407bd8f 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 44e3bca6..6021e672 100644
+index 44e3bca61..6021e6729 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 {

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

@@ -1,4 +1,4 @@
-From b1e61a261f80eb5ec6ab010c0a9695ddfcd071a7 Mon Sep 17 00:00:00 2001
+From 91dd0dfff543594853c5b79b5c4b6a43ed1f797a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 29 Aug 2017 23:58:48 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -10,7 +10,7 @@ This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
 new file mode 100644
-index 00000000..06f1602f
+index 000000000..06f1602f5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
 @@ -0,0 +1,478 @@
@@ -493,7 +493,7 @@ index 00000000..06f1602f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 68cb7442..69aae30a 100644
+index 68cb74420..69aae30a3 100644
 --- a/src/main/java/org/bukkit/Particle.java
 +++ b/src/main/java/org/bukkit/Particle.java
 @@ -92,6 +92,17 @@ public enum Particle {
@@ -515,7 +515,7 @@ index 68cb7442..69aae30a 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 e1e674ba..fbd61137 100644
+index e1e674bab..fbd61137d 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -2081,7 +2081,57 @@ public interface World extends PluginMessageRecipient, Metadatable {

Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch

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

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

@@ -1,4 +1,4 @@
-From 63f352493cf36bf80eb1d97a0ea3d897b5766bd3 Mon Sep 17 00:00:00 2001
+From 3e3830e4aa44ae11c4e290cb7c0dd890316155b9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 21:33:35 -0400
 Subject: [PATCH] Close Plugin Class Loaders on Disable
@@ -7,7 +7,7 @@ This should close more memory leaks from /reload and disabling plugins,
 by closing the class loader and the jar file.
 
 diff --git a/src/main/java/org/bukkit/plugin/PluginLoader.java b/src/main/java/org/bukkit/plugin/PluginLoader.java
-index a88733f1..6ab9cd82 100644
+index a88733f1c..6ab9cd821 100644
 --- a/src/main/java/org/bukkit/plugin/PluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/PluginLoader.java
 @@ -77,4 +77,18 @@ public interface PluginLoader {
@@ -30,7 +30,7 @@ index a88733f1..6ab9cd82 100644
 +    // Paper end - close Classloader on disable
  }
 diff --git a/src/main/java/org/bukkit/plugin/PluginManager.java b/src/main/java/org/bukkit/plugin/PluginManager.java
-index 41e26451..86cc5025 100644
+index 41e26451f..86cc5025a 100644
 --- a/src/main/java/org/bukkit/plugin/PluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/PluginManager.java
 @@ -161,6 +161,18 @@ public interface PluginManager {
@@ -53,7 +53,7 @@ index 41e26451..86cc5025 100644
       * Gets a {@link Permission} from its fully qualified name
       *
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 4cbec1f1..da3cd63b 100644
+index 4cbec1f11..da3cd63ba 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -428,17 +428,28 @@ public final class SimplePluginManager implements PluginManager {
@@ -97,7 +97,7 @@ index 4cbec1f1..da3cd63b 100644
              lookupNames.clear();
              HandlerList.unregisterAll();
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 06b6724f..bc7bf6a3 100644
+index 06b6724fa..bc7bf6a35 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -332,7 +332,7 @@ public final class JavaPluginLoader implements PluginLoader {

Spigot-API-Patches/0100-WitchConsumePotionEvent.patch

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