1.15.2 update (#2887)

Functional GUI fix added by billygalbreath
2024-12-27 15:00:13 +01:00 · 2020-01-21 18:02:07 -08:00 · 2020-01-21 18:02:07 -08:00 · 9774f1ff47
commit 9774f1ff47
parent 5141569293
519 changed files with 960 additions and 961 deletions
--- a/README.md
+++ b/README.md
@ -36,7 +36,7 @@ How To (Plugin Developers)
 <dependency>
    <groupId>com.destroystokyo.paper</groupId>
    <artifactId>paper-api</artifactId>
-    <version>1.15.1-R0.1-SNAPSHOT</version>
+    <version>1.15.2-R0.1-SNAPSHOT</version>
    <scope>provided</scope>
 </dependency>
 ```
--- a/Spigot-API-Patches/API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-API-Patches/API-to-get-a-BlockState-without-a-snapshot.patch
@ -9,7 +9,7 @@ on the real tile entity.
 This is useful for where performance is needed

 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index ab6750c7a..af4ffada0 100644
+index ab6750c7..af4ffada 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
@@ -0,0 +0,0 @@ public interface Block extends Metadatable {
--- a/Spigot-API-Patches/Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-API-Patches/Ability-to-apply-mending-to-XP-API.patch
@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.

 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0a630843..2bd1af78 100644
+index dbe53123..420aa906 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/Spigot-API-Patches/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-API-Patches/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
 This will allow you to change the players name or skin on login.

 diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index c8384da69..6c09ea6c6 100644
+index c8384da6..6c09ea6c 100644
 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
@@ -0,0 +0,0 @@ package org.bukkit.event.player;
--- 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 7b0424d5..7909caef 100644
+index 0bbef14a..11b691cf 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/Access-items-by-EquipmentSlot.patch
+++ b/Spigot-API-Patches/Access-items-by-EquipmentSlot.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Access items by EquipmentSlot


 diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java
-index 88ce9dc6b..96916ec95 100644
+index 88ce9dc6..96916ec9 100644
 --- a/src/main/java/org/bukkit/inventory/PlayerInventory.java
 +++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java
@@ -0,0 +0,0 @@ public interface PlayerInventory extends Inventory {
--- a/Spigot-API-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-API-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add API methods to control if armour stands can move


 diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index d04e52fbe..387d04e5b 100644
+index d04e52fb..387d04e5 100644
 --- a/src/main/java/org/bukkit/entity/ArmorStand.java
 +++ b/src/main/java/org/bukkit/entity/ArmorStand.java
@@ -0,0 +0,0 @@ public interface ArmorStand extends LivingEntity {
--- a/Spigot-API-Patches/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-API-Patches/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.

 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 222a9a7bf..3ab914fb2 100644
+index 222a9a7b..3ab914fb 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
@@ -0,0 +0,0 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
--- a/Spigot-API-Patches/Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-API-Patches/Add-ArmorStand-Item-Meta.patch
@ -12,7 +12,7 @@ starting point for future additions in this area.

 diff --git a/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java
 new file mode 100644
-index 000000000..7e4acfff1
+index 00000000..7e4acfff
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-Ban-Methods-to-Player-Objects.patch
+++ b/Spigot-API-Patches/Add-Ban-Methods-to-Player-Objects.patch
@ -74,7 +74,7 @@ index ffc8ad37..222a9a7b 100644
     /**
      * Checks if this player is whitelisted or not
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f9a3a3e5..75bbbefd 100644
+index 083110cc..2c6ff39e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ package org.bukkit.entity;
--- a/Spigot-API-Patches/Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
+++ b/Spigot-API-Patches/Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender


 diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
-index 74816c63f..be11d52a0 100644
+index 74816c63..be11d52a 100644
 --- a/src/main/java/org/bukkit/command/CommandSender.java
 +++ b/src/main/java/org/bukkit/command/CommandSender.java
@@ -0,0 +0,0 @@ public interface CommandSender extends Permissible {
--- a/Spigot-API-Patches/Add-BeaconEffectEvent.patch
+++ b/Spigot-API-Patches/Add-BeaconEffectEvent.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add BeaconEffectEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
 new file mode 100644
-index 000000000..978813b94
+index 00000000..978813b9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-BlockSoundGroup-interface.patch
+++ b/Spigot-API-Patches/Add-BlockSoundGroup-interface.patch
@ -7,7 +7,7 @@ This PR adds the getSoundGroup() method in Block which returns a BlockSoundGroup

 diff --git a/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java b/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java
 new file mode 100644
-index 000000000..8cf87d228
+index 00000000..8cf87d22
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java
@@ -0,0 +0,0 @@
@ -64,7 +64,7 @@ index 000000000..8cf87d228
 +    Sound getFallSound();
 +}
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 87185a812..038de5a64 100644
+index 87185a81..038de5a6 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-API-Patches/Add-EntityKnockbackByEntityEvent.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityKnockbackByEntityEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java
 new file mode 100644
-index 000000000..9efecabab
+index 00000000..9efecaba
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-EntityTeleportEndGatewayEvent.patch
+++ b/Spigot-API-Patches/Add-EntityTeleportEndGatewayEvent.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityTeleportEndGatewayEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java
 new file mode 100644
-index 000000000..bfc69a43c
+index 00000000..bfc69a43
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-EntityZapEvent.patch
+++ b/Spigot-API-Patches/Add-EntityZapEvent.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityZapEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
 new file mode 100644
-index 000000000..3b725a489
+index 00000000..3b725a48
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
@@ -0,0 +0,0 @@
@ -76,7 +76,7 @@ index 000000000..3b725a489
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-index 0e0ed93b5..d3949edfc 100644
+index 0e0ed93b..d3949edf 100644
 --- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
@@ -0,0 +0,0 @@ package org.bukkit.event.entity;
--- a/Spigot-API-Patches/Add-FastUtil-to-Bukkit.patch
+++ b/Spigot-API-Patches/Add-FastUtil-to-Bukkit.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization

 diff --git a/pom.xml b/pom.xml
-index aef4ec33d..2daee11a2 100644
+index 8c443c52..a540adef 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-GS4-Query-event.patch
+++ b/Spigot-API-Patches/Add-GS4-Query-event.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add GS4 Query event

 diff --git a/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java b/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java
 new file mode 100644
-index 000000000..77a19995f
+index 00000000..77a19995
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-Heightmap-API.patch
+++ b/Spigot-API-Patches/Add-Heightmap-API.patch
@ -46,7 +46,7 @@ index 00000000..4cd9b5ed
 +    SOLID_OR_LIQUID_NO_LEAVES;
 +}
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 2a40da99..3e1ca4c9 100644
+index 77d9cd0a..59047503 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 {
@ -84,7 +84,7 @@ index 2a40da99..3e1ca4c9 100644
      * Creates explosion at this location with given power
      *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index b02cda3e..1e7b633c 100644
+index 23c76976..b46b2719 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-ItemStack-Recipe-API-helper-methods.patch
+++ b/Spigot-API-Patches/Add-ItemStack-Recipe-API-helper-methods.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add ItemStack Recipe API helper methods
 Allows using ExactChoice Recipes with easier methodss

 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index d742c4058..222a12baa 100644
+index d742c405..222a12ba 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
@@ -0,0 +0,0 @@ public class ShapedRecipe implements Recipe, Keyed {
@ -24,7 +24,7 @@ index d742c4058..222a12baa 100644
      * Get a copy of the ingredients map.
      *
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index 84062dd71..ddcf84e66 100644
+index 84062dd7..ddcf84e6 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
@@ -0,0 +0,0 @@ public class ShapelessRecipe implements Recipe, Keyed {
--- 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..f52644fab
+index 00000000..f52644fa
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
@@ -0,0 +0,0 @@
@ -49,7 +49,7 @@ index 000000000..f52644fab
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 9dc0d4ce3..a78f390d7 100644
+index 3110c385..240f276c 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-MetadataStoreBase.removeAll-Plugin.patch
+++ b/Spigot-API-Patches/Add-MetadataStoreBase.removeAll-Plugin.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin)
 So that on reload, metadata will be cleared

 diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
-index b3d85d973..0e8cd85c7 100644
+index d363d517..abbe545a 100644
 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
 +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
@@ -0,0 +0,0 @@ import java.util.ArrayList;
--- a/Spigot-API-Patches/Add-More-Creeper-API.patch
+++ b/Spigot-API-Patches/Add-More-Creeper-API.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add More Creeper API

 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java
 new file mode 100644
-index 000000000..ff10251b6
+index 00000000..ff10251b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java
@@ -0,0 +0,0 @@
@ -65,7 +65,7 @@ index 000000000..ff10251b6
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Creeper.java b/src/main/java/org/bukkit/entity/Creeper.java
-index 1b8ece6df..faaeb44a9 100644
+index 1b8ece6d..faaeb44a 100644
 --- a/src/main/java/org/bukkit/entity/Creeper.java
 +++ b/src/main/java/org/bukkit/entity/Creeper.java
@@ -0,0 +0,0 @@ public interface Creeper extends Monster {
--- a/Spigot-API-Patches/Add-PhantomPreSpawnEvent.patch
+++ b/Spigot-API-Patches/Add-PhantomPreSpawnEvent.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add PhantomPreSpawnEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java
 new file mode 100644
-index 000000000..9022f697a
+index 00000000..9022f697
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java
@@ -0,0 +0,0 @@
@ -42,7 +42,7 @@ index 000000000..9022f697a
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bukkit/entity/Phantom.java
-index 1a1044edc..ed4d417c2 100644
+index 1a1044ed..ed4d417c 100644
 --- a/src/main/java/org/bukkit/entity/Phantom.java
 +++ b/src/main/java/org/bukkit/entity/Phantom.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-API-Patches/Add-PlayerArmorChangeEvent.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java
 new file mode 100644
-index 000000000..2827a1002
+index 00000000..2827a100
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-API-Patches/Add-PlayerConnectionCloseEvent.patch
@ -35,7 +35,7 @@ is undefined.

 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java
 new file mode 100644
-index 000000000..12c1c6fe9
+index 00000000..12c1c6fe
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-API-Patches/Add-PlayerInitialSpawnEvent.patch
@ -7,7 +7,7 @@ For modifying a player's initial spawn location as they join the server

 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
 new file mode 100644
-index 000000000..8e407eff1
+index 00000000..8e407eff
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-PlayerJumpEvent.patch
+++ b/Spigot-API-Patches/Add-PlayerJumpEvent.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerJumpEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java
 new file mode 100644
-index 000000000..289a0d784
+index 00000000..289a0d78
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-PlayerLocaleChangeEvent.patch
+++ b/Spigot-API-Patches/Add-PlayerLocaleChangeEvent.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerLocaleChangeEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java
 new file mode 100644
-index 000000000..29dd763a9
+index 00000000..29dd763a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-PlayerPostRespawnEvent.patch
+++ b/Spigot-API-Patches/Add-PlayerPostRespawnEvent.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerPostRespawnEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java
 new file mode 100644
-index 000000000..31f34b548
+index 00000000..31f34b54
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-API-Patches/Add-PlayerUseUnknownEntityEvent.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerUseUnknownEntityEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java
 new file mode 100644
-index 000000000..09cfdf48e
+index 00000000..09cfdf48
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-ProjectileCollideEvent.patch
+++ b/Spigot-API-Patches/Add-ProjectileCollideEvent.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add ProjectileCollideEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
 new file mode 100644
-index 000000000..453663893
+index 00000000..45366389
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
@@ -0,0 +0,0 @@
--- 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..73dabb82c
+index 00000000..73dabb82
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-UnknownCommandEvent.patch
+++ b/Spigot-API-Patches/Add-UnknownCommandEvent.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add UnknownCommandEvent

 diff --git a/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
 new file mode 100644
-index 000000000..251342c3c
+index 00000000..251342c3
 --- /dev/null
 +++ b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-WhitelistToggleEvent.patch
+++ b/Spigot-API-Patches/Add-WhitelistToggleEvent.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add WhitelistToggleEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java b/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java
 new file mode 100644
-index 000000000..fdd5eedb2
+index 00000000..fdd5eedb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.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 8c767a0b..fec5cdc3 100644
+index b257eda2..260ee11a 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-a-call-helper-to-Event.patch
+++ b/Spigot-API-Patches/Add-a-call-helper-to-Event.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add a call helper to Event
 Reduces diff in Server patches

 diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java
-index 18d0636b7..8ec56cd6b 100644
+index 18d0636b..8ec56cd6 100644
 --- a/src/main/java/org/bukkit/event/Event.java
 +++ b/src/main/java/org/bukkit/event/Event.java
@@ -0,0 +0,0 @@ public abstract class Event {
--- 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
@ -226,7 +226,7 @@ index 22eca2a1..620a962d 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 1df31be7..b1fa15a1 100644
+index f2e9f275..7e0b1d36 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, Persiste
--- a/Spigot-API-Patches/Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-API-Patches/Add-configuration-option-to-prevent-player-names-fro.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a0a8b5408..b5b77b2d8 100644
+index a0a8b540..b5b77b2d 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -0,0 +0,0 @@ public final class Bukkit {
@ -27,7 +27,7 @@ index a0a8b5408..b5b77b2d8 100644
 
     @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d20e044dd..103897fbe 100644
+index d20e044d..103897fb 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
@ -46,7 +46,7 @@ index d20e044dd..103897fbe 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java
-index 7f153000e..1e126487d 100644
+index 7f153000..1e126487 100644
 --- a/src/main/java/org/bukkit/command/PluginCommand.java
 +++ b/src/main/java/org/bukkit/command/PluginCommand.java
@@ -0,0 +0,0 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
--- a/Spigot-API-Patches/Add-extended-PaperServerListPingEvent.patch
+++ b/Spigot-API-Patches/Add-extended-PaperServerListPingEvent.patch
@ -8,7 +8,7 @@ and allows full control of the response sent to the client.

 diff --git a/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
 new file mode 100644
-index 000000000..0cc5dd573
+index 00000000..0cc5dd57
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
@@ -0,0 +0,0 @@
@ -337,7 +337,7 @@ index 000000000..0cc5dd573
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/network/StatusClient.java b/src/main/java/com/destroystokyo/paper/network/StatusClient.java
 new file mode 100644
-index 000000000..517d15238
+index 00000000..517d1523
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/StatusClient.java
@@ -0,0 +0,0 @@
@ -355,7 +355,7 @@ index 000000000..517d15238
 +
 +}
 diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java
-index 612958a33..bb4f7702c 100644
+index 612958a3..bb4f7702 100644
 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java
 +++ b/src/main/java/org/bukkit/util/CachedServerIcon.java
@@ -0,0 +0,0 @@ public interface CachedServerIcon {
--- a/Spigot-API-Patches/Add-getI18NDisplayName-API.patch
+++ b/Spigot-API-Patches/Add-getI18NDisplayName-API.patch
@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
 You must replace the language file embedded in the server jar.

 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index bb3f7cdc1..3cada3487 100644
+index bb3f7cdc..3cada348 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
@@ -0,0 +0,0 @@ public interface ItemFactory {
@ -29,7 +29,7 @@ index bb3f7cdc1..3cada3487 100644
     // Paper end
 }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 44f3bec7d..9526cfe02 100644
+index 8d9ebcb3..65aa1c4e 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
--- a/Spigot-API-Patches/Add-getNearbyXXX-methods-to-Location.patch
+++ b/Spigot-API-Patches/Add-getNearbyXXX-methods-to-Location.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add "getNearbyXXX" methods to Location


 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 4f695faf4..5730d5f46 100644
+index f61bf28a..4cf22afc 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
@@ -0,0 +0,0 @@ import org.bukkit.util.Vector;
--- a/Spigot-API-Patches/Add-getTPS-method.patch
+++ b/Spigot-API-Patches/Add-getTPS-method.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add getTPS method


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 940c643df..9f87f333e 100644
+index 940c643d..9f87f333 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -0,0 +0,0 @@ public final class Bukkit {
@ -27,7 +27,7 @@ index 940c643df..9f87f333e 100644
      * Get the advancement specified by this key.
      *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c197e3811..e1dfa92a9 100644
+index c197e381..e1dfa92a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
--- a/Spigot-API-Patches/Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-API-Patches/Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@ -7,7 +7,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client

 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
 new file mode 100644
-index 000000000..f0bb4e31c
+index 00000000..f0bb4e31
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-legacy-ping-support-to-PaperServerListPingEvent.patch
+++ b/Spigot-API-Patches/Add-legacy-ping-support-to-PaperServerListPingEvent.patch
@ -8,7 +8,7 @@ client that does not support all of the features provided in the
 event.

 diff --git a/src/main/java/com/destroystokyo/paper/network/StatusClient.java b/src/main/java/com/destroystokyo/paper/network/StatusClient.java
-index 517d15238..ffda9f6a8 100644
+index 517d1523..ffda9f6a 100644
 --- a/src/main/java/com/destroystokyo/paper/network/StatusClient.java
 +++ b/src/main/java/com/destroystokyo/paper/network/StatusClient.java
@@ -0,0 +0,0 @@ import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
--- a/Spigot-API-Patches/Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-API-Patches/Add-method-to-open-already-placed-sign.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add method to open already placed sign


 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 5b5fb3034..cdbac95bb 100644
+index 5b5fb303..cdbac95b 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -0,0 +0,0 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
--- a/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add methods for working with arrows stuck in living entities


 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index e6249c2bf..5697728ce 100644
+index a5ea8f44..f5969cad 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
--- 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 aa88aede6..cd8d0a20e 100644
+index aa88aede..cd8d0a20 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-more-Zombie-API.patch
+++ b/Spigot-API-Patches/Add-more-Zombie-API.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add more Zombie API


 diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
-index 6dcac9798..fa7a43c35 100644
+index 6dcac979..fa7a43c3 100644
 --- a/src/main/java/org/bukkit/entity/Zombie.java
 +++ b/src/main/java/org/bukkit/entity/Zombie.java
@@ -0,0 +0,0 @@ public interface Zombie extends Monster {
--- 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..18a96dbb0
+index 00000000..18a96dbb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
@@ -0,0 +0,0 @@
@ -65,7 +65,7 @@ index 000000000..18a96dbb0
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 6e3284b20..9dc0d4ce3 100644
+index d170149d..3110c385 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-sender-name-to-commands.yml-replacement.patch
+++ b/Spigot-API-Patches/Add-sender-name-to-commands.yml-replacement.patch
@ -7,7 +7,7 @@ This allows you to use $sender in commands.yml definitions to make
 commands that auto target self.

 diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
-index a6ad94ef9..9d4f553c0 100644
+index a6ad94ef..9d4f553c 100644
 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-API-Patches/Add-setPlayerProfile-API-for-Skulls.patch
@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo
 which commonly cause rate limit issues with Mojang API

 diff --git a/src/main/java/org/bukkit/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java
-index 943d751fb..a6914f01e 100644
+index 943d751f..a6914f01 100644
 --- a/src/main/java/org/bukkit/block/Skull.java
 +++ b/src/main/java/org/bukkit/block/Skull.java
@@ -0,0 +0,0 @@ import org.bukkit.block.data.BlockData;
@ -40,7 +40,7 @@ index 943d751fb..a6914f01e 100644
      * Gets the rotation of the skull in the world (or facing direction if this
      * is a wall mounted skull).
 diff --git a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
-index 35a392033..8b2465ea2 100644
+index 35a39203..8b2465ea 100644
 --- a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-source-block-to-BlockPhysicsEvent.patch
+++ b/Spigot-API-Patches/Add-source-block-to-BlockPhysicsEvent.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add source block to BlockPhysicsEvent


 diff --git a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
-index e3a5f5824..c382f9fc2 100644
+index e3a5f582..c382f9fc 100644
 --- a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
 +++ b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
@@ -0,0 +0,0 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable {
--- a/Spigot-API-Patches/Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-API-Patches/Add-source-to-PlayerExpChangeEvent.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add source to PlayerExpChangeEvent


 diff --git a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
-index c99c9281e..7c340f539 100644
+index c99c9281..7c340f53 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-spectator-target-events.patch
+++ b/Spigot-API-Patches/Add-spectator-target-events.patch
@ -8,7 +8,7 @@ Subject: [PATCH] Add spectator target events

 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java
 new file mode 100644
-index 000000000..b8ec7ef2d
+index 00000000..b8ec7ef2
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java
@@ -0,0 +0,0 @@
@ -81,7 +81,7 @@ index 000000000..b8ec7ef2d
 +
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java
 new file mode 100644
-index 000000000..693d119ab
+index 00000000..693d119a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java
@@ -0,0 +0,0 @@
--- 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 30b3d9a8..b02cda3e 100644
+index c6e2efc3..23c76976 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/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 3cd4bff1..36ec897f 100644
+index 220420ed..bd050368 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@
--- 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
@ -18,7 +18,7 @@ Y range: [0, 1023]
 X, Z range: [-67 108 864, 67 108 863]

 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 884862ab..6dc39989 100644
+index f87ecd0a..07e532cd 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
@ -48,7 +48,7 @@ index 884862ab..6dc39989 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 d4fcbf60..ce128016 100644
+index 310041ae..5bf2ba6f 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 {
@ -88,8 +88,8 @@ index d4fcbf60..ce128016 100644
 +    // Paper end
 +
     /**
-      * Gets the y coordinate of the lowest block at this position such that the
-      * block and all blocks above it are transparent for lighting purposes.
+      * Gets the highest non-empty (impassable) coordinate at the given
+      * coordinates.
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
 index af4ffada..87185a81 100644
 --- a/src/main/java/org/bukkit/block/Block.java
--- a/Spigot-API-Patches/Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-API-Patches/Allow-Reloading-of-Command-Aliases.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml

 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a3682b291..a0a8b5408 100644
+index a3682b29..a0a8b540 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -0,0 +0,0 @@ public final class Bukkit {
@ -26,7 +26,7 @@ index a3682b291..a0a8b5408 100644
 
     @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 18faba0e2..d20e044dd 100644
+index 18faba0e..d20e044d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
@ -37,7 +37,7 @@ index 18faba0e2..d20e044dd 100644
 +    boolean reloadCommandAliases(); // Paper
 }
 diff --git a/src/main/java/org/bukkit/command/CommandMap.java b/src/main/java/org/bukkit/command/CommandMap.java
-index bd2c7a696..864c263bb 100644
+index bd2c7a69..864c263b 100644
 --- a/src/main/java/org/bukkit/command/CommandMap.java
 +++ b/src/main/java/org/bukkit/command/CommandMap.java
@@ -0,0 +0,0 @@ public interface CommandMap {
@ -56,7 +56,7 @@ index bd2c7a696..864c263bb 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index adfc7aae2..460fda05a 100644
+index adfc7aae..460fda05 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -0,0 +0,0 @@ public class SimpleCommandMap implements CommandMap {
@ -72,7 +72,7 @@ index adfc7aae2..460fda05a 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-index c62da4131..af8ab73fe 100644
+index c62da413..af8ab73f 100644
 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
@@ -0,0 +0,0 @@ public class ReloadCommand extends BukkitCommand {
--- 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 387d04e5b..492df420b 100644
+index 387d04e5..492df420 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/Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch
@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.

 diff --git a/pom.xml b/pom.xml
-index a6567413..1179fd55 100644
+index 5c25ff12..a71015f4 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-API-Patches/Allow-setting-the-vex-s-summoner.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Allow setting the vex's summoner


 diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit/entity/Vex.java
-index 6b61c4ab7..c34a3ea7b 100644
+index 6b61c4ab..c34a3ea7 100644
 --- a/src/main/java/org/bukkit/entity/Vex.java
 +++ b/src/main/java/org/bukkit/entity/Vex.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Annotation-Test-changes.patch
+++ b/Spigot-API-Patches/Annotation-Test-changes.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Annotation Test changes


 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index cc6b6e209..328a5a163 100644
+index 0c737724..38be576b 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
@@ -0,0 +0,0 @@ public class AnnotationTest {
--- 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..a83c286c1
+index 00000000..a83c286c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java
@@ -0,0 +0,0 @@
--- 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 b80b8b3b..7a0b66fe 100644
+index abd469b5..310041ae 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 {
@ -371,7 +371,7 @@ index b80b8b3b..7a0b66fe 100644
 
     /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index e5756c42..da7b35f0 100644
+index 04365232..83e02aea 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, Persistent
--- a/Spigot-API-Patches/AsyncTabCompleteEvent.patch
+++ b/Spigot-API-Patches/AsyncTabCompleteEvent.patch
@ -13,7 +13,7 @@ completion, such as offline players.

 diff --git a/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
 new file mode 100644
-index 000000000..619ed3716
+index 00000000..619ed371
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
@@ -0,0 +0,0 @@
@ -195,7 +195,7 @@ index 000000000..619ed3716
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
-index d1a9956a1..f96c4ba53 100644
+index d1a9956a..f96c4ba5 100644
 --- a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
 +++ b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
@@ -0,0 +0,0 @@
--- 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 82e379d16..12601db68 100644
+index 82e379d1..12601db6 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
--- a/Spigot-API-Patches/Basic-PlayerProfile-API.patch
+++ b/Spigot-API-Patches/Basic-PlayerProfile-API.patch
@ -7,7 +7,7 @@ Provides basic elements of a PlayerProfile to be used by future API/events

 diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
 new file mode 100644
-index 000000000..476151d2a
+index 00000000..476151d2
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
@@ -0,0 +0,0 @@
@ -158,7 +158,7 @@ index 000000000..476151d2a
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
 new file mode 100644
-index 000000000..7b3b6ef53
+index 00000000..7b3b6ef5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
@@ -0,0 +0,0 @@
@ -235,7 +235,7 @@ index 000000000..7b3b6ef53
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b5b77b2d8..161a714e5 100644
+index b5b77b2d..161a714e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -0,0 +0,0 @@ public final class Bukkit {
@ -280,7 +280,7 @@ index b5b77b2d8..161a714e5 100644
 
     @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 103897fbe..463724e40 100644
+index 103897fb..463724e4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
--- a/Spigot-API-Patches/BlockDestroyEvent.patch
+++ b/Spigot-API-Patches/BlockDestroyEvent.patch
@ -12,7 +12,7 @@ This can replace many uses of BlockPhysicsEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java
 new file mode 100644
-index 000000000..3aee12f1c
+index 00000000..3aee12f1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Change-the-reserved-channel-check-to-be-sensible.patch
+++ b/Spigot-API-Patches/Change-the-reserved-channel-check-to-be-sensible.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Change the reserved channel check to be sensible


 diff --git a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
-index 1d061412c..6fda7f3aa 100644
+index 1d061412..6fda7f3a 100644
 --- a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
 +++ b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
@@ -0,0 +0,0 @@ public class StandardMessenger implements Messenger {
@ -18,7 +18,7 @@ index 1d061412c..6fda7f3aa 100644
 
     @Override
 diff --git a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
-index dce3d619a..7e2335ed8 100644
+index dce3d619..7e2335ed 100644
 --- a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
 +++ b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
@@ -0,0 +0,0 @@ public class StandardMessengerTest {
--- a/Spigot-API-Patches/Custom-replacement-for-eaten-items.patch
+++ b/Spigot-API-Patches/Custom-replacement-for-eaten-items.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Custom replacement for eaten items


 diff --git a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
-index c2793f3ef..373f4b5b5 100644
+index c2793f3e..373f4b5b 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
@@ -0,0 +0,0 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
--- a/Spigot-API-Patches/Display-warning-on-deprecated-recipe-API.patch
+++ b/Spigot-API-Patches/Display-warning-on-deprecated-recipe-API.patch
@ -10,7 +10,7 @@ on the players login.
 Plugin authors need to define a key to keep it consistent between server restarts.

 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index d74b3114f..d742c4058 100644
+index d74b3114..d742c405 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
@@ -0,0 +0,0 @@ public class ShapedRecipe implements Recipe, Keyed {
@ -22,7 +22,7 @@ index d74b3114f..d742c4058 100644
     }
 
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index 68447fb8c..84062dd71 100644
+index 68447fb8..84062dd7 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
@@ -0,0 +0,0 @@ public class ShapelessRecipe implements Recipe, Keyed {
--- 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 ddaed8127..203cda0f9 100644
+index ddaed812..203cda0f 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..118c7b677
+index 00000000..118c7b67
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java
@@ -0,0 +0,0 @@
@ -91,7 +91,7 @@ index 000000000..118c7b677
 +}
 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..1915177f4
+index 00000000..1915177f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java
@@ -0,0 +0,0 @@
@ -158,7 +158,7 @@ index 000000000..1915177f4
 +}
 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..8414bd805
+index 00000000..8414bd80
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Enderman.teleportRandomly.patch
+++ b/Spigot-API-Patches/Enderman.teleportRandomly.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
 Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.

 diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java
-index bb325d9c8..821c690f8 100644
+index bb325d9c..821c690f 100644
 --- a/src/main/java/org/bukkit/entity/Enderman.java
 +++ b/src/main/java/org/bukkit/entity/Enderman.java
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
--- a/Spigot-API-Patches/EndermanAttackPlayerEvent.patch
+++ b/Spigot-API-Patches/EndermanAttackPlayerEvent.patch
@ -9,7 +9,7 @@ This allows you to override/extend the pumpkin/stare logic.

 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
 new file mode 100644
-index 000000000..f530a3d93
+index 00000000..f530a3d9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/EndermanEscapeEvent.patch
+++ b/Spigot-API-Patches/EndermanEscapeEvent.patch
@ -9,7 +9,7 @@ You may cancel this, enabling ranged attacks to damage the enderman for example.

 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java
 new file mode 100644
-index 000000000..806112a8b
+index 00000000..806112a8
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-API-Patches/Entity-AddTo-RemoveFrom-World-Events.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events

 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java
 new file mode 100644
-index 000000000..07660202e
+index 00000000..07660202
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java
@@ -0,0 +0,0 @@
@ -44,7 +44,7 @@ index 000000000..07660202e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java
 new file mode 100644
-index 000000000..e5dbbd660
+index 00000000..e5dbbd66
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/EntityPathfindEvent.patch
+++ b/Spigot-API-Patches/EntityPathfindEvent.patch
@ -7,7 +7,7 @@ Fires when an Entity decides to start moving to a location.

 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java
 new file mode 100644
-index 000000000..63e46b2fb
+index 00000000..63e46b2f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-API-Patches/EntityRegainHealthEvent-isFastRegen-API.patch
@ -5,7 +5,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API


 diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
-index 8feb6698f..d51d2ec1d 100644
+index 8feb6698..d51d2ec1 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
@@ -0,0 +0,0 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable
--- a/Spigot-API-Patches/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-API-Patches/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
 Adds ability to get what arrow was shot, and control if it should be consumed.

 diff --git a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
-index 18c5e31ab..37dbc12eb 100644
+index 18c5e31a..37dbc12e 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
@@ -0,0 +0,0 @@ package org.bukkit.event.entity;
--- a/Spigot-API-Patches/EntityTransformedEvent.patch
+++ b/Spigot-API-Patches/EntityTransformedEvent.patch
@ -6,7 +6,7 @@ Subject: [PATCH] EntityTransformedEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java
 new file mode 100644
-index 000000000..12194f1fc
+index 00000000..12194f1f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.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 492df420b..e7f71e65e 100644
+index 492df420..e7f71e65 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
@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.

 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 5730d5f46..b226d7e4c 100644
+index 4cf22afc..ac3c8eef 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
@@ -0,0 +0,0 @@ import java.util.HashMap;
@ -106,7 +106,7 @@ index 5730d5f46..b226d7e4c 100644
      * Returns a list of entities within a bounding box centered around a Location.
      *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index fee0f5211..af5aba4e5 100644
+index 0b357583..b257eda2 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 b226d7e4c..884862ab7 100644
+index ac3c8eef..f87ecd0a 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
@ -10,7 +10,7 @@ This adds a new Builder API which is much friendlier to use.

 diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
 new file mode 100644
-index 000000000..06f1602f5
+index 00000000..06f1602f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
@@ -0,0 +0,0 @@
@ -493,7 +493,7 @@ index 000000000..06f1602f5
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 49467ac70..d2ceb07c7 100644
+index 49467ac7..d2ceb07c 100644
 --- a/src/main/java/org/bukkit/Particle.java
 +++ b/src/main/java/org/bukkit/Particle.java
@@ -0,0 +0,0 @@ public enum Particle {
@ -515,7 +515,7 @@ index 49467ac70..d2ceb07c7 100644
      * Options which can be applied to redstone dust particles - a particle
      * color and size.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index b653c695a..548d6d683 100644
+index bd050368..0b357583 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/ExperienceOrbMergeEvent.patch
+++ b/Spigot-API-Patches/ExperienceOrbMergeEvent.patch
@ -9,7 +9,7 @@ metadata such as spawn reason, or conditionally move data from source to target.

 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java
 new file mode 100644
-index 000000000..0ce3e3977
+index 00000000..0ce3e397
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-API-Patches/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
 Replaces isFromBottle() with logic that persists entity reloads too.

 diff --git a/src/main/java/org/bukkit/entity/ExperienceOrb.java b/src/main/java/org/bukkit/entity/ExperienceOrb.java
-index c286edfd8..dec70bbfa 100644
+index c286edfd..dec70bbf 100644
 --- a/src/main/java/org/bukkit/entity/ExperienceOrb.java
 +++ b/src/main/java/org/bukkit/entity/ExperienceOrb.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Expose-WorldBorder-isInBounds-Location-check.patch
+++ b/Spigot-API-Patches/Expose-WorldBorder-isInBounds-Location-check.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check


 diff --git a/src/main/java/org/bukkit/WorldBorder.java b/src/main/java/org/bukkit/WorldBorder.java
-index 7e8f5649c..afb7b136b 100644
+index 7e8f5649..afb7b136 100644
 --- a/src/main/java/org/bukkit/WorldBorder.java
 +++ b/src/main/java/org/bukkit/WorldBorder.java
@@ -0,0 +0,0 @@ public interface WorldBorder {
--- a/Spigot-API-Patches/Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-API-Patches/Expose-client-protocol-version-and-virtual-host.patch
@ -57,7 +57,7 @@ index 00000000..7b2af1bd
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 881ccce5..0a630843 100644
+index da36c8df..dbe53123 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
--- a/Spigot-API-Patches/Expose-server-CommandMap.patch
+++ b/Spigot-API-Patches/Expose-server-CommandMap.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Expose server CommandMap


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 9f87f333e..63e48ef3f 100644
+index 9f87f333..63e48ef3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -0,0 +0,0 @@ public final class Bukkit {
@ -29,7 +29,7 @@ index 9f87f333e..63e48ef3f 100644
     public static Server.Spigot spigot()
     {
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e1dfa92a9..87300a5df 100644
+index e1dfa92a..87300a5d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
--- a/Spigot-API-Patches/Fill-Profile-Property-Events.patch
+++ b/Spigot-API-Patches/Fill-Profile-Property-Events.patch
@ -12,7 +12,7 @@ This is useful for implementing a ProfileCache for Player Skulls

 diff --git a/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java
 new file mode 100644
-index 000000000..71f36e9ca
+index 00000000..71f36e9c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java
@@ -0,0 +0,0 @@
@ -93,7 +93,7 @@ index 000000000..71f36e9ca
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java
 new file mode 100644
-index 000000000..021bc8631
+index 00000000..021bc863
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Fix-ServerListPingEvent-flagging-as-Async.patch
+++ b/Spigot-API-Patches/Fix-ServerListPingEvent-flagging-as-Async.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Fix ServerListPingEvent flagging as Async
 This event can sometimes fire Async, set the proper boolean

 diff --git a/src/main/java/org/bukkit/event/server/ServerEvent.java b/src/main/java/org/bukkit/event/server/ServerEvent.java
-index 46b119017..05167fb34 100644
+index 46b11901..05167fb3 100644
 --- a/src/main/java/org/bukkit/event/server/ServerEvent.java
 +++ b/src/main/java/org/bukkit/event/server/ServerEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Fix-upstream-javadoc-warnings-and-errors.patch
+++ b/Spigot-API-Patches/Fix-upstream-javadoc-warnings-and-errors.patch
@ -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 df4caf29..ca60c514 100644
+index edd73f41..220420ed 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/Flip-some-Spigot-API-null-annotations.patch
+++ b/Spigot-API-Patches/Flip-some-Spigot-API-null-annotations.patch
@ -9,7 +9,7 @@ a ton of noise to plugin developers.
 These do not help plugin developers if they bring moise noise than value.

 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 2148a3c26..6db691591 100644
+index 2148a3c2..6db69159 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 {
@ -31,7 +31,7 @@ index 2148a3c26..6db691591 100644
         return server.getTag(registry, tag, clazz);
     }
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 4e69f277b..2a40da99f 100644
+index 6e1a1124..77d9cd0a 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 {
@ -62,7 +62,7 @@ index 4e69f277b..2a40da99f 100644
         if (this.world == null) {
             return null;
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1cbb9bc66..27d3b5ad7 100644
+index 1cbb9bc6..27d3b5ad 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 {
@ -84,7 +84,7 @@ index 1cbb9bc66..27d3b5ad7 100644
 
     /**
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 3cada3487..03ba22659 100644
+index 3cada348..03ba2265 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
@@ -0,0 +0,0 @@ package org.bukkit.inventory;
@ -105,7 +105,7 @@ index 3cada3487..03ba22659 100644
 
     /**
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 6d18de762..495161f62 100644
+index dfe52817..19e0852c 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -0,0 +0,0 @@ import java.util.Set; // Paper
--- a/Spigot-API-Patches/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-API-Patches/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@ -68,7 +68,7 @@ index 87300a5d..d35d2def 100644
      * Gets the name of the update folder. The update folder is used to safely
      * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0fb36ebd..9a79e409 100644
+index 195c70d1..5580cdbe 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/Spigot-API-Patches/Handle-plugin-prefixes-in-implementation-logging-con.patch
+++ b/Spigot-API-Patches/Handle-plugin-prefixes-in-implementation-logging-con.patch
@ -17,7 +17,7 @@ The implementation should handle plugin prefixes by displaying
 logger names when appropriate.

 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index 223190054..bb2e55e97 100644
+index 22319005..bb2e55e9 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
@@ -0,0 +0,0 @@ public abstract class JavaPlugin extends PluginBase {
--- a/Spigot-API-Patches/Here-s-Johnny.patch
+++ b/Spigot-API-Patches/Here-s-Johnny.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Here's Johnny!


 diff --git a/src/main/java/org/bukkit/entity/Vindicator.java b/src/main/java/org/bukkit/entity/Vindicator.java
-index b8ea68a8f..c5d9e76a6 100644
+index b8ea68a8..c5d9e76a 100644
 --- a/src/main/java/org/bukkit/entity/Vindicator.java
 +++ b/src/main/java/org/bukkit/entity/Vindicator.java
@@ -0,0 +0,0 @@ package org.bukkit.entity;
--- a/Spigot-API-Patches/Ignore-package-private-methods-for-nullability-annot.patch
+++ b/Spigot-API-Patches/Ignore-package-private-methods-for-nullability-annot.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Ignore package-private methods for nullability annotations
 This isn't API

 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 328a5a163..af2abd47f 100644
+index 38be576b..a48be38b 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
@@ -0,0 +0,0 @@ public class AnnotationTest {
--- a/Show more
+++ b/Show more