Updated Upstream (Bukkit/CraftBukkit/Spigot)

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 Warning: this commit contains more mapping changes from upstream, As always, ensure that you have working backups and test this build before deployment; Developers working on paper will, yet again, need to delete their work/Minecraft/1.13.2 folder Bukkit Changes: 7fca5fd4 SPIGOT-4558: Preserve user order in the face of copied defaults in configurations 15c9b1eb Ignore spurious slot IDs sent by client, e.g. in enchanting tables 5d2a10c5 SPIGOT-3747: Add API for force loaded chunks d6dd2bb3 SPIGOT-3538: Add getHitBlockFace for ProjectileHitEvent 771db4aa SPIGOT-794: Call EntityPlaceEvent for Minecart placement 55462509 Add InventoryView#getSlotType 2f3ce5b6 Remove EntityTransformEvent and CustomItemTagContainer from draft API f04ad7b6 Make ProjectileLaunchEvent extend EntitySpawnEvent ccb85808 Define EntitySpawnEvent b8cc3ebe Add PlayerItemDamageEvent 184a495d Ease ClassLoader Deadlocks Where Possible 11ac4728 Expand Boolean Prompt Values in Conversation API aae62d51 Added getAllSessionData() to the Conversation API. 9290ff91 Add InventoryView#getInventory API 995e530f Add API to get / set base arrow damage CraftBukkit Changes: c4a67eed SPIGOT-4556: Fix plugins closing inventory during drop events 5be2ddcb Replace version constants with methods to prevent compiler inlining a5b9c7b3 Use API method to create offset command completions 2bc7d1df SPIGOT-3747: Add API for force loaded chunks a408f375 SPIGOT-3538: Add getHitBlockFace for ProjectileHitEvent b54b9409 SPIGOT-2864: Make Arrow / Item setTicksLived behave like FallingBlock 79ded7a8 SPIGOT-1811: Death message not shown on respawn screen b4a4f15d SPIGOT-943: InventoryCloseEvent called on death regardless of open inventory 0afed592 SPIGOT-794: Call EntityPlaceEvent for Minecart placement 2b2d084a Add InventoryView#getSlotType 01a9959a Do not use deprecated ItemSpawnEvent constructor 9642498d SPIGOT-4547: Call EntitySpawnEvent as general spawn fallback event 963f4a5f Add PlayerItemDamageEvent 63db0445 Add API to get / set base arrow damage 531c25d7 Add CraftMagicNumbers.MAPPINGS_VERSION for use by NMS plugins d05c8b14 Mappings Update bd36e200 SPIGOT-4551: Ignore invalid attribute modifier slots Spigot Changes: 518206a1 Remove redundant trove depend 1959ad21 MC-11211,SPIGOT-4552: Fix placing double slabs at y = 255 29ab5e43 SPIGOT-3661: Allow arguments in restart-script 7cc46316 SPIGOT-852: Growth modifiers for beetroots, potatoes, carrots 82e117e1 Squelch "fatal: Resolve operation not in progress" message 0a1a68e7 Mappings Update & Patch Rebuild
2019-01-01 03:15:55 +00:00
parent 8ef9dc94ca
commit 08b01ae4df
363 changed files with 1838 additions and 2537 deletions
--- a/Spigot-API-Patches/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/Spigot-API-Patches/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots


 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index b347a3ccf..8a8043351 100644
+index 33cd0ea0..35407d5e 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
@@ -0,0 +0,0 @@ public interface Chunk {
--- a/Spigot-API-Patches/Add-Force-Loaded-Chunk-API.patch
+++ b/Spigot-API-Patches/Add-Force-Loaded-Chunk-API.patch
@@ -1,53 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: willies952002 <admin@domnian.com>
-Date: Wed, 29 Aug 2018 00:37:30 -0400
-Subject: [PATCH] Add Force-Loaded Chunk API
-
-
-diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index 8a804335..4b9e0ca4 100644
--- a/src/main/java/org/bukkit/Chunk.java
-+++ b/src/main/java/org/bukkit/Chunk.java
-@@ -0,0 +0,0 @@ public interface Chunk {
-      * @return true if slimes are able to spawn in this chunk
-      */
-     boolean isSlimeChunk();
-+
-+    // Paper start - Force-Loaded Chunk API
-+    /**
-+     * Checks if the chunk is currently force-loaded
-+     *
-+     * @return true if the chunk is force-loaded, otherwise false
-+     */
-+    boolean isForceLoaded();
-+
-+    /**
-+     * Set's whether a chunk is force-loaded or not
-+     *
-+     * @param force whether or not to force load this chunk
-+     */
-+    void setForceLoaded(boolean force);
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index de89122e..aa28c452 100644
--- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
-         return isChunkGenerated((int) chunkKey, (int) (chunkKey >> 32));
-     }
- 
-+    /**
-+     * Checks if a chunk is force-loaded.
-+     * Note: This will only return true if the chunk is also generated
-+     *
-+     * @param x X-coordinate of the chunk
-+     * @param z Z-coordinate of the chunk
-+     * @return true if the chunk is force-loaded. otherwise false
-+     */
-+    public boolean isChunkForceLoaded(int x, int z);
-+
-     /**
-      * This is the Legacy API before Java 8 was supported. Java 8 Consumer is provided,
-      * as well as future support
--
--- a/Spigot-API-Patches/Add-ItemStackRecipeChoice-Draft-API.patch
+++ b/Spigot-API-Patches/Add-ItemStackRecipeChoice-Draft-API.patch
@@ -9,7 +9,7 @@ Allows creating recipes that must match isSimilar to full item stack.

 diff --git a/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
 new file mode 100644
-index 000000000..43e6576b1
+index 00000000..43e6576b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-API-Patches/Add-LivingEntity-getTargetEntity.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity

 diff --git a/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
 new file mode 100644
-index 000000000..5df8eed23
+index 00000000..5df8eed2
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
@@ -0,0 +0,0 @@
@@ -46,7 +46,7 @@ index 000000000..5df8eed23
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index bd47e7209..34a8fe3f7 100644
+index bd47e720..34a8fe3f 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
--- a/Spigot-API-Patches/Add-Material-Tags.patch
+++ b/Spigot-API-Patches/Add-Material-Tags.patch
@@ -8,7 +8,7 @@ are related to each other by a trait.

 diff --git a/src/main/java/com/destroystokyo/paper/MaterialSetTag.java b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java
 new file mode 100644
-index 000000000..b4f78e075
+index 00000000..b4f78e07
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java
@@ -0,0 +0,0 @@
@@ -153,7 +153,7 @@ index 000000000..b4f78e075
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java
 new file mode 100644
-index 000000000..7a48445da
+index 00000000..7a48445d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java
@@ -0,0 +0,0 @@
@@ -536,7 +536,7 @@ index 000000000..7a48445da
 +}
 diff --git a/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java
 new file mode 100644
-index 000000000..328c51471
+index 00000000..328c5147
 --- /dev/null
 +++ b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java
@@ -0,0 +0,0 @@
@@ -566,7 +566,7 @@ index 000000000..328c51471
 +    }
 +}
 diff --git a/src/test/java/org/bukkit/TestServer.java b/src/test/java/org/bukkit/TestServer.java
-index 2d8403206..613675c3b 100644
+index 2d840320..613675c3 100644
 --- a/src/test/java/org/bukkit/TestServer.java
 +++ b/src/test/java/org/bukkit/TestServer.java
@@ -0,0 +0,0 @@ public class TestServer implements InvocationHandler {
--- a/Spigot-API-Patches/Add-TNTPrimeEvent.patch
+++ b/Spigot-API-Patches/Add-TNTPrimeEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add TNTPrimeEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
 new file mode 100644
-index 000000000..2ae8826bb
+index 00000000..2ae8826b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-World.getEntity-UUID-API.patch
+++ b/Spigot-API-Patches/Add-World.getEntity-UUID-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add World.getEntity(UUID) API


 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index e83b2ac7..7c700cc2 100644
+index 70e7c9e3..301d9418 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/Spigot-API-Patches/Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@@ -217,7 +217,7 @@ index fe8d3468..074769c1 100644
         return key;
     }
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index df51f3ca..e9f640fb 100644
+index 4d0351c4..03e3cfd4 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
@@ -0,0 +0,0 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {
--- a/Spigot-API-Patches/Add-an-asterisk-to-legacy-API-plugins.patch
+++ b/Spigot-API-Patches/Add-an-asterisk-to-legacy-API-plugins.patch
@@ -7,7 +7,7 @@ Not here to name and shame, only so server admins can be aware of which
 plugins have and haven't been updated.

 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index a4aabfe7f..f462b631b 100644
+index a4aabfe7..f462b631 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -0,0 +0,0 @@ public interface UnsafeValues {
@@ -22,7 +22,7 @@ index a4aabfe7f..f462b631b 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
-index b1d384e82..72c0c0bc6 100644
+index b1d384e8..72c0c0bc 100644
 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
@@ -0,0 +0,0 @@ public class PluginsCommand extends BukkitCommand {
@@ -42,7 +42,7 @@ index b1d384e82..72c0c0bc6 100644
 
         StringBuilder pluginList = new StringBuilder();
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 3cff01b6b..2b9aad0a7 100644
+index c7782e7d..39f92d88 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
--- a/Spigot-API-Patches/Add-hand-to-bucket-events.patch
+++ b/Spigot-API-Patches/Add-hand-to-bucket-events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add hand to bucket events


 diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
-index 8fb121a91..7b9596f30 100644
+index 8fb121a9..7b9596f3 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
@@ -0,0 +0,0 @@ import org.bukkit.block.Block;
@@ -30,7 +30,7 @@ index 8fb121a91..7b9596f30 100644
     public HandlerList getHandlers() {
         return handlers;
 diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
-index 56584687f..3dbe428ba 100644
+index 56584687..3dbe428b 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
@@ -0,0 +0,0 @@ import org.bukkit.block.Block;
@@ -82,7 +82,7 @@ index 56584687f..3dbe428ba 100644
         return cancelled;
     }
 diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
-index 94e042a36..884b9240b 100644
+index 94e042a3..884b9240 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
@@ -0,0 +0,0 @@ import org.bukkit.block.Block;
--- a/Spigot-API-Patches/Add-more-Witch-API.patch
+++ b/Spigot-API-Patches/Add-more-Witch-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more Witch API


 diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 4b27f689..64ec8409 100644
 --- a/src/main/java/org/bukkit/entity/Witch.java
 +++ b/src/main/java/org/bukkit/entity/Witch.java
@@ -0,0 +0,0 @@ package org.bukkit.entity;
--- a/Spigot-API-Patches/Add-player-view-distance-API.patch
+++ b/Spigot-API-Patches/Add-player-view-distance-API.patch
@@ -5,7 +5,7 @@ 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 a631529df..4208b0d2c 100644
+index a631529d..4208b0d2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/Spigot-API-Patches/Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-API-Patches/Add-ray-tracing-methods-to-LivingEntity.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity

 diff --git a/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
 new file mode 100644
-index 000000000..fe43d9557
+index 00000000..fe43d955
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
@@ -0,0 +0,0 @@
@@ -61,7 +61,7 @@ index 000000000..fe43d9557
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index e3bc04e1c..bd47e7209 100644
+index e3bc04e1..bd47e720 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
--- a/Spigot-API-Patches/Add-sun-related-API.patch
+++ b/Spigot-API-Patches/Add-sun-related-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add sun related API


 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index aa28c452..27e58136 100644
+index 668c9b7a..67e062b8 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/Add-workaround-for-plugins-modifying-the-parent-of-t.patch
+++ b/Spigot-API-Patches/Add-workaround-for-plugins-modifying-the-parent-of-t.patch
@@ -14,7 +14,7 @@ parent of the plugin logger to avoid this.

 diff --git a/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java
 new file mode 100644
-index 000000000..d052b2f55
+index 00000000..d052b2f5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java
@@ -0,0 +0,0 @@
@@ -58,7 +58,7 @@ index 000000000..d052b2f55
 +
 +}
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index a81dae439..15f22ade2 100644
+index a81dae43..15f22ade 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
@@ -0,0 +0,0 @@ public abstract class JavaPlugin extends PluginBase {
@@ -85,7 +85,7 @@ index a81dae439..15f22ade2 100644
 
     /**
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 44093af29..ab79b71bf 100644
+index bc33ff33..213f6234 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -0,0 +0,0 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -94,8 +94,8 @@ index 44093af29..ab79b71bf 100644
     private IllegalStateException pluginState;
 +    private java.util.logging.Logger logger; // Paper - add field
 
-     // Spigot Start
-     static
+     static {
+         ClassLoader.registerAsParallelCapable();
@@ -0,0 +0,0 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
         this.manifest = jar.getManifest();
         this.url = file.toURI().toURL();
--- a/Spigot-API-Patches/Additional-world.getNearbyEntities-API-s.patch
+++ b/Spigot-API-Patches/Additional-world.getNearbyEntities-API-s.patch
@@ -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 849ad2cb..99fbf327 100644
+index e66caa41..d9010176 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ package org.bukkit;
--- a/Spigot-API-Patches/Allow-Blocks-to-be-accessed-via-a-long-key.patch
+++ b/Spigot-API-Patches/Allow-Blocks-to-be-accessed-via-a-long-key.patch
@@ -49,7 +49,7 @@ index 8dcb15fb..7e1ee875 100644
      * @return A new location where X/Y/Z are the center of the block
      */
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 6635285f..071a8490 100644
+index 92688252..1467debe 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-API-Patches/Allow-disabling-armour-stand-ticking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling armour stand ticking


 diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index 099da6ce1..859f166fb 100644
+index 099da6ce..859f166f 100644
 --- a/src/main/java/org/bukkit/entity/ArmorStand.java
 +++ b/src/main/java/org/bukkit/entity/ArmorStand.java
@@ -0,0 +0,0 @@ public interface ArmorStand extends LivingEntity {
--- a/Spigot-API-Patches/AnvilDamageEvent.patch
+++ b/Spigot-API-Patches/AnvilDamageEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] AnvilDamageEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java
 new file mode 100644
-index 000000000..fd3c5c02e
+index 00000000..fd3c5c02
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Arrow-pickup-rule-API.patch
+++ b/Spigot-API-Patches/Arrow-pickup-rule-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Arrow pickup rule API


 diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
-index 99814eee..34dde443 100644
+index b74d5f9d..99a44006 100644
 --- a/src/main/java/org/bukkit/entity/Arrow.java
 +++ b/src/main/java/org/bukkit/entity/Arrow.java
@@ -0,0 +0,0 @@ public interface Arrow extends Projectile {
--- a/Spigot-API-Patches/Async-Chunks-API.patch
+++ b/Spigot-API-Patches/Async-Chunks-API.patch
@@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously.
 Also adds utility methods to Entity to teleport asynchronously.

 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 00d72565..8e322cab 100644
+index deabd400..92688252 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -365,7 +365,7 @@ index 00d72565..8e322cab 100644
 
     /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index f94160bf..5ee57656 100644
+index 2dd7a03c..59787c47 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
--- a/Spigot-API-Patches/Automatically-disable-plugins-that-fail-to-load.patch
+++ b/Spigot-API-Patches/Automatically-disable-plugins-that-fail-to-load.patch
@@ -5,7 +5,7 @@ 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 81b42822..3af99b5b 100644
+index 54594546..bf972302 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
--- a/Spigot-API-Patches/Close-Plugin-Class-Loaders-on-Disable.patch
+++ b/Spigot-API-Patches/Close-Plugin-Class-Loaders-on-Disable.patch
@@ -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 e7981a1d9..d34756f15 100644
+index e7981a1d..d34756f1 100644
 --- a/src/main/java/org/bukkit/plugin/PluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/PluginLoader.java
@@ -0,0 +0,0 @@ public interface PluginLoader {
@@ -31,7 +31,7 @@ index e7981a1d9..d34756f15 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 e5638d560..b72d5a9bc 100644
+index e5638d56..b72d5a9b 100644
 --- a/src/main/java/org/bukkit/plugin/PluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/PluginManager.java
@@ -0,0 +0,0 @@ public interface PluginManager {
@@ -54,7 +54,7 @@ index e5638d560..b72d5a9bc 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 bd0588a20..cb2b0b9cb 100644
+index bd0588a2..cb2b0b9c 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
@@ -100,7 +100,7 @@ index bd0588a20..cb2b0b9cb 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 72d506d1f..3411a365c 100644
+index 77207f14..c7782e7d 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
--- a/Spigot-API-Patches/Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
+++ b/Spigot-API-Patches/Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't use snapshots for Timings Tile Entity reports


 diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
-index c2c2fb83..769facd8 100644
+index 28d0954a..7ad9400a 100644
 --- a/src/main/java/co/aikar/timings/TimingHistory.java
 +++ b/src/main/java/co/aikar/timings/TimingHistory.java
@@ -0,0 +0,0 @@ public class TimingHistory {
--- a/Spigot-API-Patches/EnderDragon-Events.patch
+++ b/Spigot-API-Patches/EnderDragon-Events.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] EnderDragon Events

 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java
 new file mode 100644
-index 000000000..ef2a8dab9
+index 00000000..ef2a8dab
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java
@@ -0,0 +0,0 @@
@@ -84,7 +84,7 @@ index 000000000..ef2a8dab9
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java
 new file mode 100644
-index 000000000..d8c3ab330
+index 00000000..d8c3ab33
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java
@@ -0,0 +0,0 @@
@@ -146,7 +146,7 @@ index 000000000..d8c3ab330
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java
 new file mode 100644
-index 000000000..aa70dda10
+index 00000000..aa70dda1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Expand-ArmorStand-API.patch
+++ b/Spigot-API-Patches/Expand-ArmorStand-API.patch
@@ -8,7 +8,7 @@ Add the following:
 - Enable/Disable slot interactions

 diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index 859f166fb..eda4873d5 100644
+index 859f166f..eda4873d 100644
 --- a/src/main/java/org/bukkit/entity/ArmorStand.java
 +++ b/src/main/java/org/bukkit/entity/ArmorStand.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Expand-Explosions-API.patch
+++ b/Spigot-API-Patches/Expand-Explosions-API.patch
@@ -98,7 +98,7 @@ index 162a76e8..056a4d6b 100644
     @Override
     public boolean equals(Object obj) {
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 1f63eba8..e83b2ac7 100644
+index 379fd2fa..70e7c9e3 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/Expand-Location-Manipulation-API.patch
+++ b/Spigot-API-Patches/Expand-Location-Manipulation-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Location Manipulation API
 Adds set(x, y, z), add(base, x, y, z), subtract(base, x, y, z);

 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 056a4d6bb..8dcb15fb8 100644
+index 056a4d6b..8dcb15fb 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
@@ -0,0 +0,0 @@ public class Location implements Cloneable, ConfigurationSerializable {
--- a/Spigot-API-Patches/Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-API-Patches/Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -452,7 +452,7 @@ index 4d0acaf5..827aa00c 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 3cc161de..c9b3ff76 100644
+index d9010176..379fd2fa 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-API-Patches/Expose-attack-cooldown-methods-for-Player.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose attack cooldown methods for Player


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c9f027f99..7f6ae5d16 100644
+index c9f027f9..7f6ae5d1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/Spigot-API-Patches/Fix-upstream-javadoc-warnings-and-errors.patch
+++ b/Spigot-API-Patches/Fix-upstream-javadoc-warnings-and-errors.patch
@@ -21,7 +21,7 @@ index 43239f84..fe8d3468 100644
      */
     @Deprecated
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 04573ec2..0750d64c 100644
+index 6ce38e03..e66caa41 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
+++ b/Spigot-API-Patches/Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
@@ -1,55 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Brokkonaut <hannos17@gmx.de>
-Date: Sat, 30 Jun 2018 05:45:04 +0200
-Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the
- projectile has hit
-
-
-diff --git a/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java b/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
-index 35f4148bb..db105e764 100644
--- a/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
-+++ b/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
-@@ -0,0 +0,0 @@ public class ProjectileHitEvent extends EntityEvent {
-     private static final HandlerList handlers = new HandlerList();
-     private final Entity hitEntity;
-     private final Block hitBlock;
-+    private final org.bukkit.block.BlockFace hitBlockFace; // Paper
- 
-     public ProjectileHitEvent(final Projectile projectile) {
-         this(projectile, null, null);
-@@ -0,0 +0,0 @@ public class ProjectileHitEvent extends EntityEvent {
-     }
- 
-     public ProjectileHitEvent(final Projectile projectile, Entity hitEntity, Block hitBlock) {
-+        // Paper Start - Add a constructor that includes a BlockFace parameter
-+        this(projectile, hitEntity, hitBlock, null);
-+    }
-+
-+    public ProjectileHitEvent(final Projectile projectile, Entity hitEntity, Block hitBlock, org.bukkit.block.BlockFace hitBlockFace) {
-+        // Paper End
-         super(projectile);
-         this.hitEntity = hitEntity;
-         this.hitBlock = hitBlock;
-+        this.hitBlockFace = hitBlockFace; // Paper
-     }
- 
-     @Override
-@@ -0,0 +0,0 @@ public class ProjectileHitEvent extends EntityEvent {
-         return hitBlock;
-     }
- 
-+    // Paper Start
-+    /**
-+     * Gets the face of the block that the projectile has hit.
-+     *
-+     * @return hit block face or else null
-+     */
-+    public org.bukkit.block.BlockFace getHitBlockFace() {
-+        return hitBlockFace;
-+    }
-+    // Paper End
-+
-     /**
-      * Gets the entity that was hit, if it was an entity that was hit.
-      *
--
--- a/Spigot-API-Patches/InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-API-Patches/InventoryCloseEvent-Reason-API.patch
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.

 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index ca789867d..d4b3caebd 100644
+index ca789867..d4b3caeb 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -0,0 +0,0 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
@@ -27,7 +27,7 @@ index ca789867d..d4b3caebd 100644
      * Returns the ItemStack currently in your hand, can be empty.
      *
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
-index 19889b278..e6e45b936 100644
+index 19889b27..e6e45b93 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
@@ -0,0 +0,0 @@ import org.bukkit.inventory.InventoryView;
--- a/Spigot-API-Patches/Make-the-default-permission-message-configurable.patch
+++ b/Spigot-API-Patches/Make-the-default-permission-message-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make the default permission message configurable


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 233a71540..22ca2900c 100644
+index 233a7154..22ca2900 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -0,0 +0,0 @@ public final class Bukkit {
@@ -24,7 +24,7 @@ index 233a71540..22ca2900c 100644
      * Creates a PlayerProfile for the specified uuid, with name as null
      * @param uuid UUID to create profile for
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b8076fc3f..9c78f18f6 100644
+index b8076fc3..9c78f18f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
@@ -41,7 +41,7 @@ index b8076fc3f..9c78f18f6 100644
      * Creates a PlayerProfile for the specified uuid, with name as null
      * @param uuid UUID to create profile for
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 4a479627d..77171cd17 100644
+index 4a479627..77171cd1 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
@@ -0,0 +0,0 @@ public abstract class Command {
--- a/Spigot-API-Patches/Material-API-additions.patch
+++ b/Spigot-API-Patches/Material-API-additions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Material API additions


 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 14cae61fb..393024343 100644
+index 14cae61f..39302434 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
@@ -0,0 +0,0 @@ import org.bukkit.material.MaterialData;
--- a/Spigot-API-Patches/Mob-Pathfinding-API.patch
+++ b/Spigot-API-Patches/Mob-Pathfinding-API.patch
@@ -13,7 +13,7 @@ You can use EntityPathfindEvent to cancel new pathfinds from overriding your cur

 diff --git a/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java
 new file mode 100644
-index 000000000..d6953b390
+index 00000000..d6953b39
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java
@@ -0,0 +0,0 @@
@@ -185,7 +185,7 @@ index 000000000..d6953b390
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
-index d029d34ea..48eddcd30 100644
+index d029d34e..48eddcd3 100644
 --- a/src/main/java/org/bukkit/entity/Mob.java
 +++ b/src/main/java/org/bukkit/entity/Mob.java
@@ -0,0 +0,0 @@ import org.bukkit.loot.Lootable;
--- a/Spigot-API-Patches/Performance-Concurrency-Improvements-to-Permissions.patch
+++ b/Spigot-API-Patches/Performance-Concurrency-Improvements-to-Permissions.patch
@@ -18,7 +18,7 @@ Optimized it to simply be a single get call cutting permission map
 lookups in half.

 diff --git a/src/main/java/org/bukkit/permissions/PermissibleBase.java b/src/main/java/org/bukkit/permissions/PermissibleBase.java
-index d4cb00a82..486f69f86 100644
+index d4cb00a8..486f69f8 100644
 --- a/src/main/java/org/bukkit/permissions/PermissibleBase.java
 +++ b/src/main/java/org/bukkit/permissions/PermissibleBase.java
@@ -0,0 +0,0 @@ public class PermissibleBase implements Permissible {
--- a/Spigot-API-Patches/Player.setPlayerProfile-API.patch
+++ b/Spigot-API-Patches/Player.setPlayerProfile-API.patch
@@ -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 5f3e085e3..1e349066d 100644
+index 5f3e085e..1e349066 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ package org.bukkit.entity;
--- a/Spigot-API-Patches/PlayerElytraBoostEvent.patch
+++ b/Spigot-API-Patches/PlayerElytraBoostEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerElytraBoostEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
 new file mode 100644
-index 000000000..cecb2182c
+index 00000000..cecb2182
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/PlayerLaunchProjectileEvent.patch
+++ b/Spigot-API-Patches/PlayerLaunchProjectileEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerLaunchProjectileEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java
 new file mode 100644
-index 000000000..d2b244a41
+index 00000000..d2b244a4
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/PreSpawnerSpawnEvent.patch
+++ b/Spigot-API-Patches/PreSpawnerSpawnEvent.patch
@@ -10,7 +10,7 @@ spawners.

 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java
 new file mode 100644
-index 000000000..d72212105
+index 00000000..d7221210
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Provide-Chunk-Coordinates-as-a-Long-API.patch
+++ b/Spigot-API-Patches/Provide-Chunk-Coordinates-as-a-Long-API.patch
@@ -7,7 +7,7 @@ Allows you to easily access the chunks X/z as a long, and a method
 to look up by the long key too.

 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index 079b9feb..b347a3cc 100644
+index 441ed7ad..33cd0ea0 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
@@ -0,0 +0,0 @@ public interface Chunk {
@@ -44,7 +44,7 @@ index 079b9feb..b347a3cc 100644
      * Gets the world containing this chunk
      *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 7c700cc2..00d72565 100644
+index 301d9418..deabd400 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/Remove-Precondition-on-name-for-AttributeModifier.patch
+++ b/Spigot-API-Patches/Remove-Precondition-on-name-for-AttributeModifier.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove Precondition on name for AttributeModifier
 Vanilla allows empty names

 diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java
-index 2bc9878ff..0943eee46 100644
+index 2bc9878f..0943eee4 100644
 --- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
 +++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
@@ -0,0 +0,0 @@ public class AttributeModifier implements ConfigurationSerializable {
--- a/Spigot-API-Patches/Remove-deadlock-risk-in-firing-async-events.patch
+++ b/Spigot-API-Patches/Remove-deadlock-risk-in-firing-async-events.patch
@@ -16,7 +16,7 @@ which results in a hard crash.
 This change removes the synchronize and adds some protection around enable/disable

 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index cb2b0b9cb..a7dd902fb 100644
+index cb2b0b9c..a7dd902f 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
@@ -79,7 +79,7 @@ index cb2b0b9cb..a7dd902fb 100644
         RegisteredListener[] listeners = handlers.getRegisteredListeners();
 
 diff --git a/src/test/java/org/bukkit/plugin/PluginManagerTest.java b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
-index 6b86128e1..56308c0c6 100644
+index 6b86128e..56308c0c 100644
 --- a/src/test/java/org/bukkit/plugin/PluginManagerTest.java
 +++ b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
@@ -0,0 +0,0 @@ public class PluginManagerTest {
--- a/Spigot-API-Patches/SkeletonHorse-Additions.patch
+++ b/Spigot-API-Patches/SkeletonHorse-Additions.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] SkeletonHorse Additions

 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
 new file mode 100644
-index 000000000..55bae018e
+index 00000000..55bae018
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
@@ -0,0 +0,0 @@
@@ -54,7 +54,7 @@ index 000000000..55bae018e
 +}
 +
 diff --git a/src/main/java/org/bukkit/entity/SkeletonHorse.java b/src/main/java/org/bukkit/entity/SkeletonHorse.java
-index b2c6b6a86..ba9983463 100644
+index b2c6b6a8..ba998346 100644
 --- a/src/main/java/org/bukkit/entity/SkeletonHorse.java
 +++ b/src/main/java/org/bukkit/entity/SkeletonHorse.java
@@ -0,0 +0,0 @@ package org.bukkit.entity;
--- a/Spigot-API-Patches/Timings-v2.patch
+++ b/Spigot-API-Patches/Timings-v2.patch
@@ -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 000000000..98079dc0c
+index 00000000..98079dc0
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java
@@ -0,0 +0,0 @@
@@ -94,7 +94,7 @@ index 000000000..98079dc0c
 +}
 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 000000000..8c43e2061
+index 00000000..8c43e206
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/NullTimingHandler.java
@@ -0,0 +0,0 @@
@@ -161,7 +161,7 @@ index 000000000..8c43e2061
 +}
 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 000000000..feddcdbd4
+index 00000000..feddcdbd
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
@@ -0,0 +0,0 @@
@@ -248,7 +248,7 @@ index 000000000..feddcdbd4
 +}
 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 000000000..b2260104c
+index 00000000..b2260104
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/Timing.java
@@ -0,0 +0,0 @@
@@ -330,7 +330,7 @@ index 000000000..b2260104c
 +}
 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 000000000..f222d6b7d
+index 00000000..f222d6b7
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingData.java
@@ -0,0 +0,0 @@
@@ -456,7 +456,7 @@ index 000000000..f222d6b7d
 +}
 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 000000000..521c985e6
+index 00000000..521c985e
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHandler.java
@@ -0,0 +0,0 @@
@@ -662,7 +662,7 @@ index 000000000..521c985e6
 +}
 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 000000000..28d0954a3
+index 00000000..28d0954a
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistory.java
@@ -0,0 +0,0 @@
@@ -1013,7 +1013,7 @@ index 000000000..28d0954a3
 +}
 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 000000000..0e114eb32
+index 00000000..0e114eb3
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
@@ -0,0 +0,0 @@
@@ -1074,7 +1074,7 @@ index 000000000..0e114eb32
 +}
 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 000000000..a7f1f44d7
+index 00000000..a7f1f44d
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingIdentifier.java
@@ -0,0 +0,0 @@
@@ -1186,7 +1186,7 @@ index 000000000..a7f1f44d7
 +}
 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 000000000..f907649ba
+index 00000000..f907649b
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/Timings.java
@@ -0,0 +0,0 @@
@@ -1476,7 +1476,7 @@ index 000000000..f907649ba
 +}
 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 000000000..56b10e898
+index 00000000..56b10e89
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsCommand.java
@@ -0,0 +0,0 @@
@@ -1601,7 +1601,7 @@ index 000000000..56b10e898
 +}
 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 000000000..df7f42595
+index 00000000..df7f4259
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -0,0 +0,0 @@
@@ -1949,7 +1949,7 @@ index 000000000..df7f42595
 +}
 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 000000000..f63e7033c
+index 00000000..f63e7033
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsManager.java
@@ -0,0 +0,0 @@
@@ -2142,7 +2142,7 @@ index 000000000..f63e7033c
 +}
 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 000000000..e7c389c05
+index 00000000..e7c389c0
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsReportListener.java
@@ -0,0 +0,0 @@
@@ -2220,7 +2220,7 @@ index 000000000..e7c389c05
 +}
 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 000000000..5edaba128
+index 00000000..5edaba12
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
@@ -0,0 +0,0 @@
@@ -2277,7 +2277,7 @@ index 000000000..5edaba128
 +}
 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 000000000..23ac07f2c
+index 00000000..23ac07f2
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/Counter.java
@@ -0,0 +0,0 @@
@@ -2318,7 +2318,7 @@ index 000000000..23ac07f2c
 +}
 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 000000000..962749750
+index 00000000..96274975
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/JSONUtil.java
@@ -0,0 +0,0 @@
@@ -2453,7 +2453,7 @@ index 000000000..962749750
 +}
 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 000000000..24eae4bea
+index 00000000..24eae4be
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/LoadingIntMap.java
@@ -0,0 +0,0 @@
@@ -2530,7 +2530,7 @@ index 000000000..24eae4bea
 +}
 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 000000000..9a4f9dca8
+index 00000000..9a4f9dca
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/LoadingMap.java
@@ -0,0 +0,0 @@
@@ -2875,7 +2875,7 @@ index 000000000..9a4f9dca8
 +}
 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 000000000..df592d855
+index 00000000..df592d85
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/MRUMapCache.java
@@ -0,0 +0,0 @@
@@ -2982,7 +2982,7 @@ index 000000000..df592d855
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 2ce174401..7fdd1a084 100644
+index 2ce17440..7fdd1a08 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -0,0 +0,0 @@ public final class Bukkit {
@@ -2994,7 +2994,7 @@ index 2ce174401..7fdd1a084 100644
 
     /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 63392d5e7..0e7a81c88 100644
+index 63392d5e..0e7a81c8 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
@@ -3028,7 +3028,7 @@ index 63392d5e7..0e7a81c88 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 000000000..fd452bce4
+index 00000000..fd452bce
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/BufferedCommandSender.java
@@ -0,0 +0,0 @@
@@ -3051,7 +3051,7 @@ index 000000000..fd452bce4
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 4c931f186..4a479627d 100644
+index 4c931f18..4a479627 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
@@ -0,0 +0,0 @@ public abstract class Command {
@@ -3081,7 +3081,7 @@ index 4c931f186..4a479627d 100644
             return true;
         }
 diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
-index 502578837..9c80f4640 100644
+index 50257883..9c80f464 100644
 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
@@ -0,0 +0,0 @@ public class FormattedCommandAlias extends Command {
@@ -3104,7 +3104,7 @@ index 502578837..9c80f4640 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 000000000..5527e7c86
+index 00000000..5527e7c8
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/MessageCommandSender.java
@@ -0,0 +0,0 @@
@@ -3214,7 +3214,7 @@ index 000000000..5527e7c86
 +
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index d9183db2f..43e52a77a 100644
+index d9183db2..43e52a77 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -0,0 +0,0 @@ public class SimpleCommandMap implements CommandMap {
@@ -3249,7 +3249,7 @@ index d9183db2f..43e52a77a 100644
             // Note: we don't return the result of target.execute as thats success / failure, we return handled (true) or not handled (false)
 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 bba914d7f..000000000
+index bba914d7..00000000
 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 +++ /dev/null
@@ -0,0 +0,0 @@
@@ -3507,7 +3507,7 @@ index bba914d7f..000000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5054276ff..0993f31b1 100644
+index 5054276f..0993f31b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3523,7 +3523,7 @@ index 5054276ff..0993f31b1 100644
 
     @Override
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 8b130abb7..80c152ba9 100644
+index 8b130abb..80c152ba 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
@@ -3580,7 +3580,7 @@ index 8b130abb7..80c152ba9 100644
     }
 }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 113b899cc..81b428222 100644
+index 2d4c75ab..54594546 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -0,0 +0,0 @@ import org.bukkit.plugin.PluginLoader;
@@ -3593,7 +3593,7 @@ index 113b899cc..81b428222 100644
 /**
@@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
     private final Pattern[] fileFilters = new Pattern[] { Pattern.compile("\\.jar$"), };
-     private final Map<String, Class<?>> classes = new java.util.concurrent.ConcurrentHashMap<String, Class<?>>(); // Spigot
+     private final Map<String, Class<?>> classes = new ConcurrentHashMap<String, Class<?>>();
     private final List<PluginClassLoader> loaders = new CopyOnWriteArrayList<PluginClassLoader>();
 -    public static final CustomTimingsHandler pluginParentTimer = new CustomTimingsHandler("** Plugins"); // Spigot
 
@@ -3629,7 +3629,7 @@ index 113b899cc..81b428222 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 af8af8ef0..44093af29 100644
+index 7a8abe75..bc33ff33 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -0,0 +0,0 @@ import org.bukkit.plugin.PluginDescriptionFile;
@@ -3640,10 +3640,10 @@ index af8af8ef0..44093af29 100644
 +public final class PluginClassLoader extends URLClassLoader { // Spigot
 +    public JavaPlugin getPlugin() { return plugin; } // Spigot
     private final JavaPluginLoader loader;
-     private final Map<String, Class<?>> classes = new java.util.concurrent.ConcurrentHashMap<String, Class<?>>(); // Spigot
+     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 5ca863b36..048047067 100644
+index 5ca863b3..04804706 100644
 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java
 +++ b/src/main/java/org/bukkit/util/CachedServerIcon.java
@@ -0,0 +0,0 @@ import org.bukkit.event.server.ServerListPingEvent;
@@ -3655,7 +3655,7 @@ index 5ca863b36..048047067 100644
 +    public String getData(); // Spigot
 +}
 diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java
-index 8d982974e..e9f76006e 100644
+index 8d982974..e9f76006 100644
 --- a/src/main/java/org/spigotmc/CustomTimingsHandler.java
 +++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Turtle-API.patch
+++ b/Spigot-API-Patches/Turtle-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Turtle API

 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java
 new file mode 100644
-index 000000000..11248ee93
+index 00000000..11248ee9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java
@@ -0,0 +0,0 @@
@@ -57,7 +57,7 @@ index 000000000..11248ee93
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
 new file mode 100644
-index 000000000..7cb00f78d
+index 00000000..7cb00f78
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
@@ -0,0 +0,0 @@
@@ -144,7 +144,7 @@ index 000000000..7cb00f78d
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java
 new file mode 100644
-index 000000000..5d53ee08b
+index 00000000..5d53ee08
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java
@@ -0,0 +0,0 @@
@@ -206,7 +206,7 @@ index 000000000..5d53ee08b
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Turtle.java b/src/main/java/org/bukkit/entity/Turtle.java
-index 0a4cd2993..e547eead4 100644
+index 0a4cd299..e547eead 100644
 --- a/src/main/java/org/bukkit/entity/Turtle.java
 +++ b/src/main/java/org/bukkit/entity/Turtle.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Use-ASM-for-event-executors.patch
+++ b/Spigot-API-Patches/Use-ASM-for-event-executors.patch
@@ -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 b5cc156cd..310c30bb6 100644
+index f9fbc40a..1d42d42a 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -0,0 +0,0 @@
@@ -29,7 +29,7 @@ index b5cc156cd..310c30bb6 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 000000000..9ff99e3b3
+index 00000000..9ff99e3b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
@@ -0,0 +0,0 @@
@@ -75,7 +75,7 @@ index 000000000..9ff99e3b3
 +}
 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 000000000..f60f01005
+index 00000000..f60f0100
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
@@ -0,0 +0,0 @@
@@ -120,7 +120,7 @@ index 000000000..f60f01005
 +}
 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 000000000..140cf0ad3
+index 00000000..140cf0ad
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
@@ -0,0 +0,0 @@
@@ -170,7 +170,7 @@ index 000000000..140cf0ad3
 +}
 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 000000000..6941d9fbf
+index 00000000..6941d9fb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
@@ -0,0 +0,0 @@
@@ -208,7 +208,7 @@ index 000000000..6941d9fbf
 +}
 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 000000000..1473ff8cd
+index 00000000..1473ff8c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
@@ -0,0 +0,0 @@
@@ -277,7 +277,7 @@ index 000000000..1473ff8cd
 +}
 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 000000000..62acbf821
+index 00000000..62acbf82
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
@@ -0,0 +0,0 @@
@@ -315,7 +315,7 @@ index 000000000..62acbf821
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java
-index 3b2c99ea7..b45b6c1c3 100644
+index 3b2c99ea..b45b6c1c 100644
 --- a/src/main/java/org/bukkit/plugin/EventExecutor.java
 +++ b/src/main/java/org/bukkit/plugin/EventExecutor.java
@@ -0,0 +0,0 @@ import org.bukkit.event.Event;
@@ -401,7 +401,7 @@ index 3b2c99ea7..b45b6c1c3 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 3af99b5bd..72d506d1f 100644
+index bf972302..77207f14 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
--- a/Spigot-API-Patches/Vex-getSummoner-API.patch
+++ b/Spigot-API-Patches/Vex-getSummoner-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Vex#getSummoner API
 Get's the Mob that summoned this Vex

 diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit/entity/Vex.java
-index a2f2fcaec..d395e405d 100644
+index a2f2fcae..d395e405 100644
 --- a/src/main/java/org/bukkit/entity/Vex.java
 +++ b/src/main/java/org/bukkit/entity/Vex.java
@@ -0,0 +0,0 @@ package org.bukkit.entity;
--- a/Spigot-API-Patches/isChunkGenerated-API.patch
+++ b/Spigot-API-Patches/isChunkGenerated-API.patch
@@ -33,7 +33,7 @@ index 7e1ee875..9457832b 100644
     /**
      * Sets the position of this Location and returns itself
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index adace47c..de89122e 100644
+index 1467debe..668c9b7a 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {