Update upstream & fix some chunk related issues (#2177)

* Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes: 4090d01f SPIGOT-5047: Correct slot types for 1.14 inventories e8c08362 SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks. d445af3b SPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
2024-12-18 04:20:08 +01:00 · 2019-06-13 19:27:40 -07:00 · 2019-06-13 19:27:40 -07:00 · 5c7081fecc
Commit 5c7081fecc
--- a/Spigot-API-Patches/0001-POM-changes.patch
+++ b/Spigot-API-Patches/0001-POM-changes.patch
@ -1,4 +1,4 @@
-From b3e029c256e793171b8e2944cf70605421487858 Mon Sep 17 00:00:00 2001
+From 4110bb0715fb2cd59da12c0b29d17b6d92065689 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
--- a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch
+++ b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch
@ -1,4 +1,4 @@
-From 12e0d1a8dbc8180bd231739a3970f6d4faea9329 Mon Sep 17 00:00:00 2001
+From 807914ba1f9c48905a288418d8c30d15adb42c7c 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
--- a/Spigot-API-Patches/0003-Paper-Utils.patch
+++ b/Spigot-API-Patches/0003-Paper-Utils.patch
@ -1,4 +1,4 @@
-From d19655d8222dc11620e19634a04e10b2ef5d8ea3 Mon Sep 17 00:00:00 2001
+From 7abc5f9f843420fdc68e86f72c193f1f1ace76d8 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
--- a/Spigot-API-Patches/0004-Timings-v2.patch
+++ b/Spigot-API-Patches/0004-Timings-v2.patch
@ -1,4 +1,4 @@
-From ec9366fbf7c0d45df35bdae45ce9c8703412129a Mon Sep 17 00:00:00 2001
+From abbdc3ccdc193cc48ec75f0ed89e031db717f5e6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2

 diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
 new file mode 100644
-index 00000000..64531fcc
+index 000000000..64531fcce
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java
@@ -0,0 +1,84 @@
@ -96,7 +96,7 @@ index 00000000..64531fcc
 +}
 diff --git a/src/main/java/co/aikar/timings/NullTimingHandler.java b/src/main/java/co/aikar/timings/NullTimingHandler.java
 new file mode 100644
-index 00000000..9b45ce88
+index 000000000..9b45ce887
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/NullTimingHandler.java
@@ -0,0 +1,68 @@
@ -170,7 +170,7 @@ index 00000000..9b45ce88
 +}
 diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java
 new file mode 100644
-index 00000000..933ecf9b
+index 000000000..933ecf9bd
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
@@ -0,0 +1,83 @@
@ -259,7 +259,7 @@ index 00000000..933ecf9b
 +}
 diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java
 new file mode 100644
-index 00000000..a21e5ead
+index 000000000..a21e5ead5
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/Timing.java
@@ -0,0 +1,83 @@
@ -348,7 +348,7 @@ index 00000000..a21e5ead
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingData.java b/src/main/java/co/aikar/timings/TimingData.java
 new file mode 100644
-index 00000000..a5d13a1e
+index 000000000..a5d13a1e4
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingData.java
@@ -0,0 +1,122 @@
@ -476,7 +476,7 @@ index 00000000..a5d13a1e
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHandler.java b/src/main/java/co/aikar/timings/TimingHandler.java
 new file mode 100644
-index 00000000..cc0390c0
+index 000000000..cc0390c06
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHandler.java
@@ -0,0 +1,227 @@
@ -709,7 +709,7 @@ index 00000000..cc0390c0
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
 new file mode 100644
-index 00000000..ddaed812
+index 000000000..ddaed8127
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistory.java
@@ -0,0 +1,354 @@
@ -1069,7 +1069,7 @@ index 00000000..ddaed812
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHistoryEntry.java b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
 new file mode 100644
-index 00000000..86d5ac6b
+index 000000000..86d5ac6bd
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
@@ -0,0 +1,58 @@
@ -1133,7 +1133,7 @@ index 00000000..86d5ac6b
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingIdentifier.java b/src/main/java/co/aikar/timings/TimingIdentifier.java
 new file mode 100644
-index 00000000..df142a89
+index 000000000..df142a89b
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingIdentifier.java
@@ -0,0 +1,116 @@
@ -1255,7 +1255,7 @@ index 00000000..df142a89
 +}
 diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
 new file mode 100644
-index 00000000..0b34e0d0
+index 000000000..0b34e0d01
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/Timings.java
@@ -0,0 +1,293 @@
@ -1554,7 +1554,7 @@ index 00000000..0b34e0d0
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
 new file mode 100644
-index 00000000..c0d8f201
+index 000000000..c0d8f2016
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsCommand.java
@@ -0,0 +1,122 @@
@ -1682,7 +1682,7 @@ index 00000000..c0d8f201
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
 new file mode 100644
-index 00000000..5923adfe
+index 000000000..5923adfe6
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -0,0 +1,355 @@
@ -2043,7 +2043,7 @@ index 00000000..5923adfe
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsManager.java b/src/main/java/co/aikar/timings/TimingsManager.java
 new file mode 100644
-index 00000000..ef824d70
+index 000000000..ef824d701
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsManager.java
@@ -0,0 +1,188 @@
@ -2237,7 +2237,7 @@ index 00000000..ef824d70
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsReportListener.java b/src/main/java/co/aikar/timings/TimingsReportListener.java
 new file mode 100644
-index 00000000..bf3e059f
+index 000000000..bf3e059fe
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsReportListener.java
@@ -0,0 +1,75 @@
@ -2318,7 +2318,7 @@ index 00000000..bf3e059f
 +}
 diff --git a/src/main/java/co/aikar/timings/UnsafeTimingHandler.java b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
 new file mode 100644
-index 00000000..632c4961
+index 000000000..632c49615
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
@@ -0,0 +1,53 @@
@ -2377,7 +2377,7 @@ index 00000000..632c4961
 +}
 diff --git a/src/main/java/co/aikar/util/Counter.java b/src/main/java/co/aikar/util/Counter.java
 new file mode 100644
-index 00000000..80155072
+index 000000000..80155072d
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/Counter.java
@@ -0,0 +1,38 @@
@ -2421,7 +2421,7 @@ index 00000000..80155072
 +}
 diff --git a/src/main/java/co/aikar/util/JSONUtil.java b/src/main/java/co/aikar/util/JSONUtil.java
 new file mode 100644
-index 00000000..190bf059
+index 000000000..190bf0598
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/JSONUtil.java
@@ -0,0 +1,140 @@
@ -2567,7 +2567,7 @@ index 00000000..190bf059
 +}
 diff --git a/src/main/java/co/aikar/util/LoadingIntMap.java b/src/main/java/co/aikar/util/LoadingIntMap.java
 new file mode 100644
-index 00000000..63a899c7
+index 000000000..63a899c7d
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/LoadingIntMap.java
@@ -0,0 +1,76 @@
@ -2649,7 +2649,7 @@ index 00000000..63a899c7
 +}
 diff --git a/src/main/java/co/aikar/util/LoadingMap.java b/src/main/java/co/aikar/util/LoadingMap.java
 new file mode 100644
-index 00000000..aedbb033
+index 000000000..aedbb0332
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/LoadingMap.java
@@ -0,0 +1,368 @@
@ -3023,7 +3023,7 @@ index 00000000..aedbb033
 +}
 diff --git a/src/main/java/co/aikar/util/MRUMapCache.java b/src/main/java/co/aikar/util/MRUMapCache.java
 new file mode 100644
-index 00000000..5989ee21
+index 000000000..5989ee212
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/MRUMapCache.java
@@ -0,0 +1,111 @@
@ -3139,7 +3139,7 @@ index 00000000..5989ee21
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0822b8e5..940c643d 100644
+index 0822b8e53..940c643df 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -574,7 +574,6 @@ public final class Bukkit {
@ -3151,7 +3151,7 @@ index 0822b8e5..940c643d 100644
 
     /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 11c5c205..c197e381 100644
+index 11c5c2054..c197e3811 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -1250,6 +1250,26 @@ public interface Server extends PluginMessageRecipient {
@ -3182,7 +3182,7 @@ index 11c5c205..c197e381 100644
          * Sends the component to the player
          *
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 247d194f..72c5501e 100644
+index 247d194f8..72c5501e8 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -69,4 +69,12 @@ public interface UnsafeValues {
@ -3200,7 +3200,7 @@ index 247d194f..72c5501e 100644
 }
 diff --git a/src/main/java/org/bukkit/command/BufferedCommandSender.java b/src/main/java/org/bukkit/command/BufferedCommandSender.java
 new file mode 100644
-index 00000000..f9a00aec
+index 000000000..f9a00aecc
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/BufferedCommandSender.java
@@ -0,0 +1,21 @@
@ -3226,7 +3226,7 @@ index 00000000..f9a00aec
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 4bfc2146..03bdc162 100644
+index 4bfc21468..03bdc1622 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
@@ -33,7 +33,8 @@ public abstract class Command {
@ -3256,7 +3256,7 @@ index 4bfc2146..03bdc162 100644
             return true;
         }
 diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
-index d6c8938b..a6ad94ef 100644
+index d6c8938b1..a6ad94ef9 100644
 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
@@ -9,6 +9,7 @@ public class FormattedCommandAlias extends Command {
@ -3280,7 +3280,7 @@ index d6c8938b..a6ad94ef 100644
     }
 diff --git a/src/main/java/org/bukkit/command/MessageCommandSender.java b/src/main/java/org/bukkit/command/MessageCommandSender.java
 new file mode 100644
-index 00000000..ca1893e9
+index 000000000..ca1893e9f
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/MessageCommandSender.java
@@ -0,0 +1,114 @@
@ -3399,7 +3399,7 @@ index 00000000..ca1893e9
 +
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 81e4fa57..f020cb04 100644
+index 81e4fa573..f020cb04e 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -15,7 +15,6 @@ import org.bukkit.command.defaults.BukkitCommand;
@ -3456,7 +3456,7 @@ index 81e4fa57..f020cb04 100644
 
 diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 deleted file mode 100644
-index 6023e4f6..00000000
+index 6023e4f61..000000000
 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 +++ /dev/null
@@ -1,253 +0,0 @@
@ -3714,7 +3714,7 @@ index 6023e4f6..00000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 766c724b..72b08e73 100644
+index 766c724be..72b08e73a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1580,6 +1580,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@ -3730,7 +3730,7 @@ index 766c724b..72b08e73 100644
 
     @NotNull
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index f648c598..78a2d2f8 100644
+index f648c5989..78a2d2f8d 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -297,7 +297,6 @@ public final class SimplePluginManager implements PluginManager {
@ -3787,7 +3787,7 @@ index f648c598..78a2d2f8 100644
     }
 }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 1173e433..82e379d1 100644
+index 1173e433a..82e379d16 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -53,7 +53,6 @@ public final class JavaPluginLoader implements PluginLoader {
@ -3830,7 +3830,7 @@ index 1173e433..82e379d1 100644
                 eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
             } else {
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 0ffc1dfd..b859796b 100644
+index 0ffc1dfdb..b859796b4 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -24,7 +24,8 @@ import org.jetbrains.annotations.Nullable;
@ -3844,7 +3844,7 @@ index 0ffc1dfd..b859796b 100644
     private final Map<String, Class<?>> classes = new ConcurrentHashMap<String, Class<?>>();
     private final PluginDescriptionFile description;
 diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java
-index 5ca863b3..612958a3 100644
+index 5ca863b36..612958a33 100644
 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java
 +++ b/src/main/java/org/bukkit/util/CachedServerIcon.java
@@ -2,6 +2,7 @@ package org.bukkit.util;
@ -3867,7 +3867,7 @@ index 5ca863b3..612958a3 100644
 +
 +}
 diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java
-index b71235f6..3cbe5c2b 100644
+index b71235f69..3cbe5c2bb 100644
 --- a/src/main/java/org/spigotmc/CustomTimingsHandler.java
 +++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java
@@ -1,3 +1,26 @@
--- a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch
+++ b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch
@ -1,11 +1,11 @@
-From af149156929088bcfddf1bb9f7561fa6255a8be4 Mon Sep 17 00:00:00 2001
+From b6532b8784860126e695a65abf433761e5385208 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Mon, 29 Feb 2016 17:22:34 -0600
 Subject: [PATCH] Player affects spawning API


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 72b08e73..f5d31648 100644
+index 72b08e73a..f5d31648f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1463,6 +1463,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/Spigot-API-Patches/0006-Add-getTPS-method.patch
+++ b/Spigot-API-Patches/0006-Add-getTPS-method.patch
@ -1,4 +1,4 @@
-From 2add78cba99e477862cf447e11d02e4df0e5795b Mon Sep 17 00:00:00 2001
+From bc6a70d6bdab8d4b350e6321f315edc5c3f932b6 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
--- a/Spigot-API-Patches/0007-Entity-Origin-API.patch
+++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch
@ -1,4 +1,4 @@
-From 13cf66cb0e08d0cfd3698a607cb0de052992b480 Mon Sep 17 00:00:00 2001
+From 1e4cedf5e513f03fc6aa7cb07056f169ed04053c 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
--- a/Spigot-API-Patches/0008-Version-Command-2.0.patch
+++ b/Spigot-API-Patches/0008-Version-Command-2.0.patch
@ -1,4 +1,4 @@
-From 552986e5dd52cbe6524baa2fe47b634f50500a89 Mon Sep 17 00:00:00 2001
+From 6124a93a7105107c53e80a258380ffd286354c31 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
--- a/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch
+++ b/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch
@ -1,4 +1,4 @@
-From 6a8f23c6b0bd02d204456cd2460b5e2c65a90c2c Mon Sep 17 00:00:00 2001
+From 0e9476604dfa54e5502607d51dc95c61b15ceb84 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
--- a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch
+++ b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch
@ -1,11 +1,11 @@
-From 5bb98070c72a6c08bf15a002acbda0f5a23b203d Mon Sep 17 00:00:00 2001
+From 417fce30c787e11eb56818606ae27cd9b3b0f265 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 18:05:37 -0600
 Subject: [PATCH] Add player view distance API


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f5d31648..a9b11322 100644
+index f5d31648f..a9b11322b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1477,6 +1477,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch
+++ b/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch
@ -1,4 +1,4 @@
-From 49159b8720dbfeed57b0a553bdc90a044577f508 Mon Sep 17 00:00:00 2001
+From 03e1b338735a7e2ee5581026c54c4b5ffdb4d1f5 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
--- a/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch
@ -1,4 +1,4 @@
-From 5947dd372dfe23c64bbd20643438803e3cbed487 Mon Sep 17 00:00:00 2001
+From 5b64272f8b996dfd47d85e64bd0136bb602199de 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
--- a/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch
+++ b/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch
@ -1,4 +1,4 @@
-From 70633c7b9d25cdbfb631d999b307ef447a1ed579 Mon Sep 17 00:00:00 2001
+From 3b78215f400807e9ceb571c960f4bdee7da8aea7 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
--- a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch
+++ b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch
@ -1,4 +1,4 @@
-From 9922d188f075c2604ee0b1ccbebba38b3c11a2ea Mon Sep 17 00:00:00 2001
+From 1609f1dd56d9b507e3e9b35dd4cfb2b402af24fc 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
--- a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@ -1,4 +1,4 @@
-From df562987f55dddc0d0c7890ab4c5b33d3c55b181 Mon Sep 17 00:00:00 2001
+From e944d1d34899c180d6a165ddd4b79cef2b6a53c1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 19:54:32 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@ -6,7 +6,7 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
 Change Javadoc to be accurate

 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 63e48ef3..b92304e9 100644
+index 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 63e48ef3..b92304e9 100644
      * Gets the name of the update folder. The update folder is used to safely
      * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 87300a5d..d35d2def 100644
+index 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 87300a5d..d35d2def 100644
      * Gets the name of the update folder. The update folder is used to safely
      * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a9b11322..de1b1512 100644
+index a9b11322b..de1b1512f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -422,6 +422,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
@ -1,4 +1,4 @@
-From b50f74e7dfd5452d7deaeeb76a978ad70ace35c3 Mon Sep 17 00:00:00 2001
+From c76bce420738f306b2c47f2714099d328d1338dd 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 de1b1512..40246fb9 100644
+index de1b1512f..40246fb99 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1,6 +1,8 @@
--- a/Spigot-API-Patches/0017-Add-exception-reporting-event.patch
+++ b/Spigot-API-Patches/0017-Add-exception-reporting-event.patch
@ -1,4 +1,4 @@
-From a518f00b42bda3ba162cac421b441dd55d594336 Mon Sep 17 00:00:00 2001
+From 401bfc4793c0cc35396033e5fff9e5169f09ab8b 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
--- a/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch
+++ b/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch
@ -1,4 +1,4 @@
-From ff164a0952e13e8f262ae0c687f1360c05a8ded7 Mon Sep 17 00:00:00 2001
+From 6f396335289763e35a0fc5293654713c15ea1df2 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
--- a/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
+++ b/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
@ -1,4 +1,4 @@
-From c774f0ab274852a7b7c425304896283de184d7dc Mon Sep 17 00:00:00 2001
+From 991fa18b84baaf4b0ec6242b27f32888e411dab9 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
--- a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@ -1,4 +1,4 @@
-From a82cad370c048e4abeadc1952efd1dcae58d1a3a Mon Sep 17 00:00:00 2001
+From d4febe68b0b2e65542f21afe0320193e9c28e360 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
--- a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch
+++ b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch
@ -1,11 +1,11 @@
-From d5afc73fff4ee6bb850eb773ed638940ff6e87ac Mon Sep 17 00:00:00 2001
+From f8c9a0bd1f8a4bf5e8b808717dc641354e6e6e9b Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 22:59:54 -0400
 Subject: [PATCH] Complete resource pack API


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 40246fb9..495d43e7 100644
+index 40246fb99..495d43e78 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1214,7 +1214,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@ -82,7 +82,7 @@ index 40246fb9..495d43e7 100644
     public class Spigot extends Entity.Spigot
     {
 diff --git a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
-index b9819565..4c2102a1 100644
+index b98195650..4c2102a11 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
@@ -11,13 +11,32 @@ import org.jetbrains.annotations.NotNull;
--- a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch
+++ b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch
@ -1,4 +1,4 @@
-From 32350eec467ac2afa26baa73be6e7f41fbdad443 Mon Sep 17 00:00:00 2001
+From 43ef8ec8dcd046b64b19d0c0ef223f3b22f611d2 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.
--- a/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch
+++ b/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch
@ -1,4 +1,4 @@
-From 0272169024ee505ee1592d5ecccc89b758d444b7 Mon Sep 17 00:00:00 2001
+From 71c0afbf707a3bb5c2b3d01f144acf3bd6d60bc4 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
--- a/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch
+++ b/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch
@ -1,4 +1,4 @@
-From 03177fc70901119e30dc8cf1c37d19ea05ac7361 Mon Sep 17 00:00:00 2001
+From 7aa10c0e4606c992367eaed629d6362f46234744 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
--- a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
@ -1,4 +1,4 @@
-From 019f194ec956a3e9c97d500d066b95b5c48928dc Mon Sep 17 00:00:00 2001
+From 7cb7e67c183da92f4851a923932160fd2e5d8c2a 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
--- a/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch
@ -1,4 +1,4 @@
-From 95131916a5f5d93f350b12a019630976d2d25d0f Mon Sep 17 00:00:00 2001
+From f2d75b2305da564f7bf67db3354fbc8d06601225 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
--- a/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch
@ -1,4 +1,4 @@
-From c3b69461ecc979423729c0967e4336b50c078dda Mon Sep 17 00:00:00 2001
+From 161216be890690e9d2eaeee9eae695cd0be921ed 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
--- a/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch
@ -1,4 +1,4 @@
-From f2fc90f114e93b6c0fbe5c6f30c8531968e9de40 Mon Sep 17 00:00:00 2001
+From d52052dd79d229e71d29da0873547ddae1933053 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
--- a/Spigot-API-Patches/0029-EntityPathfindEvent.patch
+++ b/Spigot-API-Patches/0029-EntityPathfindEvent.patch
@ -1,4 +1,4 @@
-From a66578234dea48996b7d7483d3a819792c8b3c93 Mon Sep 17 00:00:00 2001
+From 13ce91688059f9bc8beabdffaa96a6dafac1d328 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:15:34 -0400
 Subject: [PATCH] EntityPathfindEvent
--- a/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch
+++ b/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch
@ -1,4 +1,4 @@
-From 0508f80da3da659a490dc6f3d1ee7e07ff5abcd0 Mon Sep 17 00:00:00 2001
+From db3f81a458a83b49003a7a119b920bc5ba79072c 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
--- a/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch
+++ b/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch
@ -1,4 +1,4 @@
-From 0a6d869f3c9a97e13107d64099f27b73414799ab Mon Sep 17 00:00:00 2001
+From a63c6275864661b88d37ebb5870a53c978d2498d 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)
--- a/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch
@ -1,4 +1,4 @@
-From 9858f3b880966d75740bf15f83cf9135ed3ed0de Mon Sep 17 00:00:00 2001
+From d24c31b6a1b4263c4d50cf971287d737211ab17c 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
--- a/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@ -1,4 +1,4 @@
-From e1874caf49d11d319c67f650c50f89522bc35163 Mon Sep 17 00:00:00 2001
+From 36607b558d3ac1a3122354442bf6d54764094279 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
--- a/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch
+++ b/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch
@ -1,4 +1,4 @@
-From f60334f986fa97b67906ca99d7f655a4b757e8b7 Mon Sep 17 00:00:00 2001
+From 06faff5e0489233fecbe3cb2fda7aa50d92f696f 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
--- a/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch
@ -1,4 +1,4 @@
-From 8940e7d1f71a344b76954326e6836a9882f943cf Mon Sep 17 00:00:00 2001
+From 7e61db52ad3ceaae7d2b495a51f6e7bbb22f4ccf 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
--- a/Spigot-API-Patches/0036-LootTable-API.patch
+++ b/Spigot-API-Patches/0036-LootTable-API.patch
@ -1,4 +1,4 @@
-From 6b58ff457bb263429d4ede1ec871cf5efc47da0b Mon Sep 17 00:00:00 2001
+From 57c87e1ca56c7ea43bb0a4eba69000e7ab71a05d 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
--- a/Spigot-API-Patches/0037-Add-EntityZapEvent.patch
+++ b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch
@ -1,4 +1,4 @@
-From 25acd4059391456b1824e2b86be9efee9b579877 Mon Sep 17 00:00:00 2001
+From f85769e8ba9c1aa2b67b14ed2c91ad26f639801f 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
--- a/Spigot-API-Patches/0038-Misc-Utils.patch
+++ b/Spigot-API-Patches/0038-Misc-Utils.patch
@ -1,4 +1,4 @@
-From e746bcea33d274458ccfd816fcb2f8a63ac6f1a1 Mon Sep 17 00:00:00 2001
+From 95c4831ed2b33d90983a86cbc86499d295e11ff7 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
--- a/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
@ -1,4 +1,4 @@
-From 68b57fb41e3bae33ce18fe38d6aeb4a5e00b1b1e Mon Sep 17 00:00:00 2001
+From 6d86d66bd93daede804713ec231c758574fcb62b 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
--- a/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch
@ -1,4 +1,4 @@
-From 4ae78dd5dd3aa2a87adbe810a834661deeae82e2 Mon Sep 17 00:00:00 2001
+From e3a455149e609554da57c83f1985c438e5aeec54 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
--- a/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch
+++ b/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch
@ -1,4 +1,4 @@
-From 37e2a1919a29437da21406ed3f47243a5b66c365 Mon Sep 17 00:00:00 2001
+From f5b16f625b82df46d0a83f2bb795f77e2bcc91d6 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
--- a/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch
+++ b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch
@ -1,11 +1,11 @@
-From 77b15e1b6d0d7bb903d2418c5215d321127163bd Mon Sep 17 00:00:00 2001
+From ede84c84ab6a9492dcc483ee3f8c320c09bfc946 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:55:55 -0500
 Subject: [PATCH] Add String based Action Bar API


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 495d43e7..62fe51ab 100644
+index 495d43e78..62fe51ab1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -425,6 +425,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch
@ -1,4 +1,4 @@
-From bfa947da63d3e584332db78f37e08671ae142d48 Mon Sep 17 00:00:00 2001
+From 49e1a0eb87be8cf0e59a9f8238fa1f8bdcebf5e0 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
--- a/Spigot-API-Patches/0044-IllegalPacketEvent.patch
+++ b/Spigot-API-Patches/0044-IllegalPacketEvent.patch
@ -1,4 +1,4 @@
-From 9ee58b2c80de2903db18ea2c163a6b6e2aae5084 Mon Sep 17 00:00:00 2001
+From a8f5ece74e38bb84395fa50e72af2d7ecb6fb1c9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 4 Dec 2016 01:19:14 -0500
 Subject: [PATCH] IllegalPacketEvent
--- a/Spigot-API-Patches/0045-Fireworks-API-s.patch
+++ b/Spigot-API-Patches/0045-Fireworks-API-s.patch
@ -1,4 +1,4 @@
-From 85c132f14e2c2617018124b1bd4e6bbf01202967 Mon Sep 17 00:00:00 2001
+From 6920434f57d65bdcb36d94c4c347c5e30f3775ad 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
--- a/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch
@ -1,4 +1,4 @@
-From 23a6fdaa9571cba7bf8a3dfb77b867ebe21cf05c Mon Sep 17 00:00:00 2001
+From d195a143ae7c58d0a4baa03bb5c499c5ca5005ee Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 20:29:33 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
--- a/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch
@ -1,4 +1,4 @@
-From c4d70f57de38f0309bdc520b81d71e8321ae9cbd Mon Sep 17 00:00:00 2001
+From a9222d3c4350c8a74f59350de1232146f4b4630b 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
--- a/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@ -1,4 +1,4 @@
-From 495b6eca21f4c309b5deca8c7dae128dbc4437bc Mon Sep 17 00:00:00 2001
+From 10036e2271d95fe3aad4c1f99ce26ce01983a28e 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
--- a/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch
+++ b/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch
@ -1,4 +1,4 @@
-From 55f5cea677e52578871f152f191b6e2d1254e5b0 Mon Sep 17 00:00:00 2001
+From 60572f2bac5d9d2b536872d4a31b06b5e954115d 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
--- a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
@ -1,4 +1,4 @@
-From 7ffd449da31280a2729fff793273fdd0ec2efb99 Mon Sep 17 00:00:00 2001
+From 97c0bae11704c0340b9a20d26d06cd1bc286c7be 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
--- a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch
+++ b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch
@ -1,4 +1,4 @@
-From b7fced171296a683ca63cb04104f501dc1a37d30 Mon Sep 17 00:00:00 2001
+From 66afc4fa6b46a600e21c2c3519b07870a4b00dcb Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 10 Jun 2017 16:59:40 -0500
 Subject: [PATCH] Fix upstream javadoc warnings and errors
@ -6,7 +6,7 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors
 Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.

 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index d1d64fb6..2fe46faf 100644
+index d1d64fb60..2fe46faf0 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -1657,6 +1657,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@ -74,7 +74,7 @@ index d1d64fb6..2fe46faf 100644
     public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
 
 diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
-index c2096b53..bca9d365 100644
+index c2096b534..bca9d3659 100644
 --- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java
 +++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
@@ -142,6 +142,7 @@ public interface AreaEffectCloud extends Entity {
@ -86,7 +86,7 @@ index c2096b53..bca9d365 100644
     <T> void setParticle(@NotNull Particle particle, @Nullable T data);
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 62fe51ab..f14bdd22 100644
+index 62fe51ab1..f14bdd22f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -440,7 +440,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@ -179,7 +179,7 @@ index 62fe51ab..f14bdd22 100644
     public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
-index 1b2267f4..1a58734d 100644
+index 1b2267f4e..1a58734d9 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
@@ -78,7 +78,7 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
--- a/Spigot-API-Patches/0052-Item-canEntityPickup.patch
+++ b/Spigot-API-Patches/0052-Item-canEntityPickup.patch
@ -1,4 +1,4 @@
-From d9669515edd73353d2ea0ce547fa98a210776a57 Mon Sep 17 00:00:00 2001
+From 9a6e1cc4daf83cbd118f9d47e5ab20ce4015018c 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
--- a/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch
@ -1,4 +1,4 @@
-From f772280393bb1d4abe8ee41528c4dde92691509e Mon Sep 17 00:00:00 2001
+From 86d616000511cc1aeed2f8a4870f13de4abad628 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
--- a/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch
@ -1,4 +1,4 @@
-From fe4a1550ea9e102b54504671767ad33fe89647d1 Mon Sep 17 00:00:00 2001
+From b76fc97a0232e55bf7fbe24cbb97a14ae59b4abf 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
--- a/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch
+++ b/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch
@ -1,4 +1,4 @@
-From cb380ac3e8c6105583c786d8ea33885211409810 Mon Sep 17 00:00:00 2001
+From 4dc8f1c4e6badf0aa20464f3143a585c669d7c23 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
--- a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch
+++ b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch
@ -1,4 +1,4 @@
-From 5c0def0c0921aa93f2a86e44d159abf7ab8db9f8 Mon Sep 17 00:00:00 2001
+From 745b108aba89064f140eddb28bf6a793bbb45e75 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
--- a/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch
+++ b/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch
@ -1,4 +1,4 @@
-From 8351f7cc785ea8e94ba98bc60df0897feb7f2058 Mon Sep 17 00:00:00 2001
+From 7cde5685e8d20a16d2cd7dc7f86c964a2a3b70ea 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
--- a/Spigot-API-Patches/0058-Profile-Lookup-Events.patch
+++ b/Spigot-API-Patches/0058-Profile-Lookup-Events.patch
@ -1,4 +1,4 @@
-From 0265b17fc637b5b058e97621adf08e5bb4766044 Mon Sep 17 00:00:00 2001
+From 6937460f262795c9820420cf93e6c0ef4fbcffd5 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
--- a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
+++ b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
@ -1,4 +1,4 @@
-From 29ccdf625a3c47d48b473656b5230c477d9574c9 Mon Sep 17 00:00:00 2001
+From 2253f78d43d8e82d209391872fa827b5279fb412 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()
--- a/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch
@ -1,4 +1,4 @@
-From e717711e99644f71dc52c8b8eba980106e5506cf Mon Sep 17 00:00:00 2001
+From 2eda3cf357cb4091bea1a72f982602e9104ce211 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
--- a/Spigot-API-Patches/0061-ensureServerConversions-API.patch
+++ b/Spigot-API-Patches/0061-ensureServerConversions-API.patch
@ -1,4 +1,4 @@
-From a1e4c9a771b5827464c1e538b2452ed09116bac1 Mon Sep 17 00:00:00 2001
+From abf4b44e9de9046faa4172331986876faaef5d7a 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
--- a/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch
+++ b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch
@ -1,4 +1,4 @@
-From 7061ed771605cf3d3692e26673ad86570b054d26 Mon Sep 17 00:00:00 2001
+From a053762804bf81a788e6de7c9d134d396774902c 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
--- a/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch
@ -1,4 +1,4 @@
-From 740e174fe3dfca46ff46de73771fd8de292339d8 Mon Sep 17 00:00:00 2001
+From 9bdc8d9de62d527ee067394e8b7d5bdd2afd3306 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:34 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
--- a/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch
+++ b/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch
@ -1,4 +1,4 @@
-From 0999a170395516445aa9da71a80e50546e463d7a Mon Sep 17 00:00:00 2001
+From 1ba89d09eb2ddf73c278f597a2c93833fd558887 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
--- a/Spigot-API-Patches/0065-LivingEntity-setKiller.patch
+++ b/Spigot-API-Patches/0065-LivingEntity-setKiller.patch
@ -1,4 +1,4 @@
-From ee435e2da2a015c2e42cb98b9739b9749d3467c1 Mon Sep 17 00:00:00 2001
+From 3217c90d3d100110a12a3c599087d1412fcd2807 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
--- a/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch
+++ b/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch
@ -1,4 +1,4 @@
-From 8c3baea68032f5add44014796c416d5ffd9e892e Mon Sep 17 00:00:00 2001
+From 61284d609548d572f43cd0342875b93feaefd295 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
--- a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
@ -1,4 +1,4 @@
-From b80b487f6e0b342dd8e92c51bf0c30654c4d961c Mon Sep 17 00:00:00 2001
+From a18dfecbab6995fd71c294c4590871c1957b47e7 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
--- a/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
+++ b/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
@ -1,4 +1,4 @@
-From 9bd539b6bfd407871c33f53045ef9754385250e2 Mon Sep 17 00:00:00 2001
+From f7565bc8c0d326ebd6500309d2d2cbc4b6ee51c9 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
--- a/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch
+++ b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch
@ -1,4 +1,4 @@
-From f531bdf527427587ebab5d6f8b4013fa4e9849cc Mon Sep 17 00:00:00 2001
+From 3b3d6200514d4c75675a971831a3f303353cb1cd 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
--- a/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch
@ -1,4 +1,4 @@
-From 4393375ceef010aea02a29c4a239b72b2315f80a Mon Sep 17 00:00:00 2001
+From 0157da796b632f929ed5fd607bbc657acf9fa8c1 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 f14bdd22..f0aee351 100644
+index f14bdd22f..f0aee351d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable;
--- a/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch
@ -1,4 +1,4 @@
-From cf64cdc270c4353101199def6de75d2562531b70 Mon Sep 17 00:00:00 2001
+From 3c961429504386861077423406b05410527fb380 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
--- a/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch
@ -1,4 +1,4 @@
-From 9d5cf099a8a97080096bcaed6068e52abf368ec0 Mon Sep 17 00:00:00 2001
+From 29c742337866538cb309776a8db6962465ee6661 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
--- a/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch
+++ b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch
@ -1,4 +1,4 @@
-From 228dbeba8577e66ae552702277c3ec51e2d504b1 Mon Sep 17 00:00:00 2001
+From fb6546240316a84266aada07ea0a0048e0b2a4ea Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:17:09 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
--- a/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch
+++ b/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch
@ -1,4 +1,4 @@
-From 7fd7423b000808b40f37c79b3a6972b4502d4542 Mon Sep 17 00:00:00 2001
+From 6bfa8efdb8a6b1c98417d31611ab555466775816 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
--- a/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch
+++ b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch
@ -1,4 +1,4 @@
-From c2787b0f711c5da60d2308e016b47dbc5a7998a6 Mon Sep 17 00:00:00 2001
+From beaa74caee947fe0235be01e39e0a655c89b8502 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:00:41 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
--- a/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch
+++ b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch
@ -1,4 +1,4 @@
-From 68ad8eef47105e5180b4f52f2226123c61b6d252 Mon Sep 17 00:00:00 2001
+From 49f9c641363fbbfd13423c3dbbf4fccdebdbe179 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:56:24 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
--- a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
@ -1,4 +1,4 @@
-From d292ff4497a3fb5fec4fc8d05b69f79c26c88778 Mon Sep 17 00:00:00 2001
+From cbc98ebf7be85c560a382ee4d48cc3f578c2ff2f 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 f0aee351..1e7bbd0e 100644
+index f0aee351d..1e7bbd0e6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -948,12 +948,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch
+++ b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch
@ -1,4 +1,4 @@
-From 8c5bb2003e483c51a5dde8096959a5062a44b73a Mon Sep 17 00:00:00 2001
+From f964e9674f741b077eb95edddad85d9faf01e638 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 16:59:43 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
--- a/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch
@ -1,4 +1,4 @@
-From fcf0bc255f96be29984c13473c0f0545db3f63d5 Mon Sep 17 00:00:00 2001
+From fb78151fa68d3a9ab9cb2cf3659a02595560a03b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:31:37 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
--- a/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch
@ -1,4 +1,4 @@
-From 33ee96aa37c781c3707f0ff8e43b7a2a38bd0fd8 Mon Sep 17 00:00:00 2001
+From cc8a78acc426282ecc2d2e90e0e031f1aa8ea82f 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
--- a/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch
+++ b/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch
@ -1,4 +1,4 @@
-From ead8e433f9e52b5b867884e2cb1cfabecb3d556d Mon Sep 17 00:00:00 2001
+From ffffc2c2bd2a8c6302355b9eaa249cfe5021159b 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
--- a/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch
@ -1,4 +1,4 @@
-From 157fc2d86718ec7fa405abbc73791ff2d0db919e Mon Sep 17 00:00:00 2001
+From 87ae4675cc8f9248300f7c41d06121b0dca856ee 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
--- a/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch
@ -1,4 +1,4 @@
-From 46b764af9db79c78d639d08e797c28dcd93ec981 Mon Sep 17 00:00:00 2001
+From 430c19d7aa0eb0e2dbde634676b665d253669d61 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
--- a/Spigot-API-Patches/0084-Optimize-Hoppers.patch
+++ b/Spigot-API-Patches/0084-Optimize-Hoppers.patch
@ -1,4 +1,4 @@
-From 9a156e6947b5c9c31a983dcee2670e4bc7c3aee3 Mon Sep 17 00:00:00 2001
+From f504537606dd234d43075d20e9efac0e76bdb2d9 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
--- a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch
@ -1,4 +1,4 @@
-From 5ce17867715b109030f8d6e968ce082239cf26a2 Mon Sep 17 00:00:00 2001
+From a94f5fca9e22f84e1ed553bb53228938c3a7e079 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
--- a/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@ -1,4 +1,4 @@
-From 03ae0f31ff5b17555697b06a1178beb408cd3fc2 Mon Sep 17 00:00:00 2001
+From e37945a5eefd4246c9fc42b42daf2e9ce81d7f13 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
--- a/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch
+++ b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch
@ -1,4 +1,4 @@
-From a1ea7d82c8bcc6a79ce00cf190d56535c0c58488 Mon Sep 17 00:00:00 2001
+From 05c90b3a666999ecf6ca0fdb824c8e4ef3f09528 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
--- a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
+++ b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
@ -1,4 +1,4 @@
-From 3d8f97070c36b970b9f4594e0c98d07832974efa Mon Sep 17 00:00:00 2001
+From a204b6caee96110b7145497447e67b5c784b5f78 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:28:55 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.

 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1e7bbd0e..759d4210 100644
+index 1e7bbd0e6..759d42109 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3,6 +3,7 @@ package org.bukkit.entity;
--- a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch
+++ b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch
@ -1,4 +1,4 @@
-From 055c2692f3638b4dde69db0813f2a80a6933ce5b Mon Sep 17 00:00:00 2001
+From aeee26dcf880c0670381073a9ff2baf808ed7739 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
--- a/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
+++ b/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
@ -1,4 +1,4 @@
-From 167ffd14b3c785b940cb71b2846a12650e5aad7e Mon Sep 17 00:00:00 2001
+From 546e453739bd983de0706baf4ec72ac2665ba7d9 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
--- a/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch
@ -1,4 +1,4 @@
-From c9ba674d7c0ac87d4a3002730eb2994643845732 Mon Sep 17 00:00:00 2001
+From f695f6cd5a9ee8ca6406f67aed271f8d4288f496 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
--- a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
+++ b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
@ -1,4 +1,4 @@
-From 7d64a389cb10c722e141824b56d53b6c40d3900f Mon Sep 17 00:00:00 2001
+From 8aa7d64d1bca98c94d8170b50a4784b1d0c04b7f 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 759d4210..203200ec 100644
+index 759d42109..203200ec5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1,10 +1,15 @@
--- a/Spigot-API-Patches/0093-EndermanEscapeEvent.patch
+++ b/Spigot-API-Patches/0093-EndermanEscapeEvent.patch
@ -1,4 +1,4 @@
-From 337a936d3a252e601ac12a47947949fadc4763d7 Mon Sep 17 00:00:00 2001
+From 26947b3096d22303635f386434624e373a26bef6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:14:30 -0400
 Subject: [PATCH] EndermanEscapeEvent
--- a/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch
+++ b/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch
@ -1,4 +1,4 @@
-From 7d86f2a56d32bf62666299cbd999d07666fdc7c0 Mon Sep 17 00:00:00 2001
+From 0a6883ae1317e0b1348aa136248e692ef3f8f928 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()
--- a/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
+++ b/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
@ -1,4 +1,4 @@
-From c647ff2d1ed9575d465edff26822a70319491c90 Mon Sep 17 00:00:00 2001
+From b6d5548e3c0283d1890cd693fa897857dbd51753 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
--- a/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch
+++ b/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch
@ -1,4 +1,4 @@
-From 731d3b535ac7624e8ac1e601d3b9ee718407bd8f Mon Sep 17 00:00:00 2001
+From 1c6f930626a0a32fb86db642a2f45cf7dd89e8f1 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
--- a/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
@ -1,4 +1,4 @@
-From 91dd0dfff543594853c5b79b5c4b6a43ed1f797a Mon Sep 17 00:00:00 2001
+From e549038128456cfdb7cf53fb683c7575dc6348cb 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
--- a/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch
+++ b/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch
@ -1,4 +1,4 @@
-From aa4f86bbc020f5306e1ada6682f1cd5038705d26 Mon Sep 17 00:00:00 2001
+From 6106d1cea7857eaef76610a6bebbab623495d8f1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:17:44 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
--- a/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch
+++ b/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch
@ -1,4 +1,4 @@
-From 3e3830e4aa44ae11c4e290cb7c0dd890316155b9 Mon Sep 17 00:00:00 2001
+From da5e5bf8a3dba0a6586ef65001ab662466726386 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
--- a/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch
+++ b/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch
@ -1,4 +1,4 @@
-From 63173a6e667fb9d210ce370b0dcdc3e7070409e9 Mon Sep 17 00:00:00 2001
+From 46a8a78dfe2160660575ac655af04acb8409bf3b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:26:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent
--- a/Mehr anzeigen
+++ b/Mehr anzeigen