Updated Upstream (Paper & Tuinity)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
54890033 [Auto] Updated Upstream (CraftBukkit)
f96c6f5c [Auto] Updated Upstream (CraftBukkit)
4be8312f [CI-SKIP] [Auto] Rebuild Patches
43e5174a Fix Entity Teleportation and cancel velocity if teleported (#4210)
0fb3daf4 [Auto] Updated Upstream (CraftBukkit)
819ff324 Use wrapped StructureManager to prevent worldgen deadlock
507f302c Fix Zombie ShouldBurnInDay API (#4268)
ef5af6f6 [Auto] Updated Upstream (CraftBukkit)
101b0110 [Auto] Updated Upstream (Bukkit/CraftBukkit)
03689cf9 Fix javadoc (#4276)
c247857f Cache block data strings
ce2eae5c [Auto] Updated Upstream (Bukkit/CraftBukkit)
563f77ad install remapped server jar to paper package space
1ab021dd Updated Upstream (Bukkit/CraftBukkit)
c970f880 Properly pass the close reason for new inventory opens (#2658) (#4247)
07bca94f Create HoverEvent from ItemStack Entity
da33f8bb Add a way to get translation keys for blocks, entities and materials
5a20cbd7 Add more Evoker API
7a3e2520 [Auto] Updated Upstream (CraftBukkit)
b0cbebdc Fix build conflicts
dfc54a8b Add zombie targets turtle egg config (#4181)
0fe00f61 Add BellRingEvent for village bells (#2230)
414e5e1d fix #4144 (#4170)
5c7f3fc0 Fix PersistentDataContainer contract violation (_->!null returns null) (#3990)
65dbf5ff [CI-SKIP] [Auto] Rebuild Patches
7ed0f7f0 Fix NPE in getBedSpawnLocation (#4238)
9e0f1101 [CI-SKIP] Add issue template
6c138412 Fix CraftTeam null check (#4249)
32e45448 Update Paperclip
b84a37b7 Update Armor items in PlayerArmorChangeEvent (#4243)
a67abf5b Increase visibility of a few methods
7d69214b [Auto] Updated Upstream (CraftBukkit)
cbfc2362 PortalCreateEvent needs to know its entity
29032edb Fix PersistentDataContainer contract violation (_->!null returns null)
f42c53df [CI-SKIP] [Auto] Rebuild Patches
3efe45f5 Port Eigencraft to 1.16
0bad6958 Make engine-mode 2 truly random
cd06ca5e Updated Upstream (CraftBukkit)
ef36b4f8 Fix TNT not pushing creative players
915fe522 Fix hex colors not working in some kick messages
f5904171 [Auto] Updated Upstream (Bukkit/CraftBukkit)
757948dc [Auto] Updated Upstream (CraftBukkit)
0893de14 Fix reading the brand message from clients
243d2313 Updated Upstream (Bukkit/CraftBukkit)
4cc7de6c Add playPickupItemAnimation to LivingEntity
20fc1b5c [Auto] Updated Upstream (CraftBukkit/Spigot)
655258b3 [Auto] Updated Upstream (CraftBukkit)
167b1db6 Fix some modded clients getting kicked for invalid payload - Fixes #4201
7f0786cd Fix enderdragon tracking range to honor vanilla
586073c3 [CI-SKIP] Update README.md (for 1.16.2) (#4202)
853f4168 Remove debug
4d7ea429 fix config option in last commit
74d27463 Buffer joins to world
ac96307b [CI-SKIP] switch back to trusty now we figured out the issue
c97ce029 1.16.2 Release (#4123)
5486b3db Fix javadocs failing jenkins builds (#4189)
1330eb5f Brand support
b8372fc0 Improve handling of indestructable blocks
a2a06640 Add moon phase API
47f71aea Fix SpawnChangeEvent not firing for all use-cases
b6c860f2 Don't require FACING data
0c1716a1 Add #setMaxPlayers API
02aed275 [CI-SKIP] Require dependencies script (#4172)
1ccc1c67 Add smithing item helpers
627f4b85 Brand support
20d9ec6b Fix MC-197271
e9287056 [CI-SKIP] Update issue templates with notices
dccaf59a MC-197883: Bandaid decode issue
99a1e58f Merge branch 'master' into progress/1.16.2
ecbc5ca0 Updated Upstream (CraftBukkit)
99362d3c Decomp fix
5f9861a0 Fix MC-197883 by specifying the typeKey
1d8c9c23 [CI-SKIP] Make checkoutpr.sh use $SHELL (#4167)
2b1ca210 update checkout-pr to latest I use
95c9b45d Fix IDE Debug JVM Flag 2 (#4141)
9e6d742c Merge remote-tracking branch 'origin/master' into progress/1.16.2
c8542f23 Fix MC-99259 Wither Boss Bar doesn't update until invulnerability period is over (#4164)
862b8c18 Updated Upstream (Bukkit/CraftBukkit)
100d51eb Do not obfuscate air (#4149)
47740f67 Updated Upstream (CraftBukkit)
948c20e0 Merge remote-tracking branch 'origin/master' into progress/1.16.2
1daafe45 Updated Upstream (Bukkit/CraftBukkit)
98828b00 Merge pull request #4132 from Proximyst/progress/1.16.2
b23f27f8  Fix incorrect return for WorldServer#addAllEntitiesSafely (#3)
5085fa30 Fix MC-187716 Use configured height
c44add5a Initialise a new chunk section if none was found yet updated
74a4d5f8 Remove armour stand double add to world
6d25cc4e Don't mark null chunk sections for block updates
1ba2f214 Updated Upstream (Bukkit/CraftBukkit)
d29d5aaa Fix anti xray
ce6bbaa4 Import fastutil classes patch
9d4616a4 Updated Upstream (Bukkit/CraftBukkit)
109d072b Fix test, add strider mob goal and fix piglin goals
e6caaa20 Fix running; forgot to push this
ee7dce8b Add this to SHIT_TO_CHECK.md aswell
d378257c Fix IDE debug JVM flag for 1.16.2
0d8db446 Merge pull request #4112 from BillyGalbreath/progress/1.16.2
d319d8c4 It compiles!
8f8371c5 Add an OBFHELPER
9caa8e9f missed this
3ce5a5d7 volatile
159eb2e1 Oopsies
7eb08d2f Almost ready
7ca11e97 Current progress on 1.16.2

Tuinity Changes:
eaa6b50 Fix missing block property portal crash
fea5fbd Retain vanilla behavior for error correction rules in collisions
9eb1a3e Do not add a delayed unload ticket for some ticket types

patches/api/0008-AFK-API.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] AFK API
 
 diff --git a/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
 new file mode 100644
-index 000000000..0c8b3e5e4
+index 00000000..0c8b3e5e
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
 @@ -0,0 +1,70 @@
@@ -81,7 +81,7 @@ index 000000000..0c8b3e5e4
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 991f757a8..472194e7e 100644
+index 991f757a..472194e7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1887,4 +1887,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0008-Evoker-API.patch

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 19 Oct 2019 00:28:53 -0500
-Subject: [PATCH] Evoker API
-
-
-diff --git a/src/main/java/org/bukkit/entity/Evoker.java b/src/main/java/org/bukkit/entity/Evoker.java
-index f8d173ad..f2a03f7f 100644
---- a/src/main/java/org/bukkit/entity/Evoker.java
-+++ b/src/main/java/org/bukkit/entity/Evoker.java
-@@ -64,4 +64,21 @@ public interface Evoker extends Spellcaster {
-      */
-     @Deprecated
-     void setCurrentSpell(@Nullable Spell spell);
-+
-+    // Purpur start
-+    /**
-+     * Get the sheep being targeted by the Wololo spell
-+     *
-+     * @return Targeted sheep
-+     */
-+    @Nullable
-+    Sheep getWololoTarget();
-+
-+    /**
-+     * Set the sheep targeted by the Wololo spell
-+     *
-+     * @param sheep Sheep to target
-+     */
-+    void setWololoTarget(@Nullable Sheep sheep);
-+    // Purpur end
- }

patches/api/0009-Bring-back-server-name.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bring back server name
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 7fd924621..f19d865dd 100644
+index bfe84236..ece4f3de 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1787,4 +1787,15 @@ public final class Bukkit {
@@ -25,7 +25,7 @@ index 7fd924621..f19d865dd 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index dacdcd1f2..ad45e2a4c 100644
+index fdceafc7..6b6f20a1 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1576,4 +1576,13 @@ public interface Server extends PluginMessageRecipient {

patches/api/0011-LivingEntity-safeFallDistance.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] LivingEntity safeFallDistance
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index a60523cc..5b688cd0 100644
+index 5adf7501..c1eaaca2 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -753,4 +753,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -815,4 +815,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
-     void setJumping(boolean jumping);
+     void playPickupItemAnimation(@NotNull Item item, int quantity);
      // Paper end
 +
 +    // Purpur start

patches/api/0012-Lagging-threshold.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f19d865dd..36bb9d37e 100644
+index ece4f3de..b4e55c17 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1797,5 +1797,14 @@ public final class Bukkit {
@@ -24,7 +24,7 @@ index f19d865dd..36bb9d37e 100644
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ad45e2a4c..5b04a7699 100644
+index 6b6f20a1..70bcd6c3 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1584,5 +1584,12 @@ public interface Server extends PluginMessageRecipient {

patches/api/0013-ItemFactory-getMonsterEgg.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] ItemFactory#getMonsterEgg
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 03ba22659..630c15d23 100644
+index 3f23927e..23d55f75 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
-@@ -166,4 +166,15 @@ public interface ItemFactory {
-     @Nullable
-     String getI18NDisplayName(@Nullable ItemStack item);
+@@ -215,4 +215,15 @@ public interface ItemFactory {
+     @NotNull
+     net.md_5.bungee.api.chat.hover.content.Content hoverContentOf(@NotNull org.bukkit.entity.Entity entity, @NotNull net.md_5.bungee.api.chat.BaseComponent[] customName);
      // Paper end
 +
 +    // Purpur start

patches/api/0014-PlayerSetSpawnerTypeWithEggEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java
 new file mode 100644
-index 000000000..c050b75e9
+index 00000000..c050b75e
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java
 @@ -0,0 +1,85 @@

patches/api/0015-EMC-MonsterEggSpawnEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] EMC - MonsterEggSpawnEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java b/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java
 new file mode 100644
-index 000000000..983d67234
+index 00000000..983d6723
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java
 @@ -0,0 +1,67 @@

patches/api/0016-Villager-resetOffers.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Villager#resetOffers
 
 
 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index c8777a476..ed703af45 100644
+index c8777a47..ed703af4 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
 @@ -113,6 +113,13 @@ public interface Villager extends AbstractVillager {

patches/api/0017-SkeletonHorseTrapEvent-getPlayer.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] SkeletonHorseTrapEvent#getPlayer
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
-index d79dbcd68..1ed3ea8fa 100644
+index d79dbcd6..1ed3ea8f 100644
 --- a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
 @@ -1,20 +1,30 @@

patches/api/0018-LivingEntity-playPickupItemAnimation.patch

@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 19 Oct 2019 02:25:05 -0500
-Subject: [PATCH] LivingEntity#playPickupItemAnimation
-
-
-diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 5b688cd04..a0db76946 100644
---- a/src/main/java/org/bukkit/entity/LivingEntity.java
-+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -768,5 +768,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
-      * @param safeFallDistance Safe fall distance
-      */
-     void setSafeFallDistance(float safeFallDistance);
-+
-+    /**
-+     * Plays pickup item animation
-+     *
-+     * @param item Item to pickup
-+     */
-+    default void playPickupItemAnimation(@NotNull Item item) {
-+        playPickupItemAnimation(item, item.getItemStack().getAmount());
-+    }
-+
-+    /**
-+     * Plays pickup item animation
-+     *
-+     * @param item Item to pickup
-+     * @param quantity Quantity of item
-+     */
-+    void playPickupItemAnimation(@NotNull Item item, int quantity);
-     // Purpur end
- }

patches/api/0018-PaperPR-PlayerItemCooldownEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] PaperPR - PlayerItemCooldownEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java
 new file mode 100644
-index 000000000..2002909f3
+index 00000000..2002909f
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java
 @@ -0,0 +1,77 @@

patches/api/0019-EntityMoveEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] EntityMoveEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java b/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java
 new file mode 100644
-index 000000000..c48c525b8
+index 00000000..c48c525b
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java
 @@ -0,0 +1,95 @@

patches/api/0020-Player-invulnerabilities.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 472194e7e..ca98852f8 100644
+index 472194e7..ca98852f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1907,5 +1907,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0021-Anvil-API.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Anvil API
 
 diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
 new file mode 100644
-index 000000000..85663c0a4
+index 00000000..85663c0a
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
 @@ -0,0 +1,52 @@
@@ -64,7 +64,7 @@ index 000000000..85663c0a4
 +}
 diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
 new file mode 100644
-index 000000000..2717ad82c
+index 00000000..2717ad82
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
 @@ -0,0 +1,35 @@
@@ -104,7 +104,7 @@ index 000000000..2717ad82c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/inventory/AnvilInventory.java b/src/main/java/org/bukkit/inventory/AnvilInventory.java
-index b95e563b5..435026e53 100644
+index b95e563b..435026e5 100644
 --- a/src/main/java/org/bukkit/inventory/AnvilInventory.java
 +++ b/src/main/java/org/bukkit/inventory/AnvilInventory.java
 @@ -109,4 +109,14 @@ public interface AnvilInventory extends Inventory {

patches/api/0022-ItemStack-convenience-methods.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack convenience methods
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index e203c5bfc..e6ba1b179 100644
+index 4ba991b7..a2e476f1 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -8635,4 +8635,36 @@ public enum Material implements Keyed {
+@@ -8645,4 +8645,36 @@ public enum Material implements Keyed {
              // </editor-fold>
          }
      }
@@ -46,7 +46,7 @@ index e203c5bfc..e6ba1b179 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index ccd81fca2..3fecde7a0 100644
+index ccd81fca..3fecde7a 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;

patches/api/0022-PaperPR-BellRingEvent.patch

@@ -1,67 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Eearslya Sleiarion <eearslya@gmail.com>
-Date: Mon, 24 Jun 2019 21:27:39 -0700
-Subject: [PATCH] PaperPR - BellRingEvent
-
-Add a new event, BellRingEvent, to trigger whenever a player rings a
-village bell. Passes along the bell block and the player who rang it.
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/block/BellRingEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BellRingEvent.java
-new file mode 100644
-index 000000000..82e0a747b
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/block/BellRingEvent.java
-@@ -0,0 +1,53 @@
-+package com.destroystokyo.paper.event.block;
-+
-+import org.bukkit.block.Block;
-+import org.bukkit.entity.Entity;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.block.BlockEvent;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Called when a bell is rung by an entity.
-+ */
-+public class BellRingEvent extends BlockEvent implements Cancellable {
-+    private static final HandlerList handlers = new HandlerList();
-+    private boolean cancelled;
-+    private Entity entity;
-+
-+    public BellRingEvent(@NotNull Block block, @NotNull Entity entity) {
-+        super(block);
-+        this.entity = entity;
-+    }
-+
-+    @Override
-+    public boolean isCancelled() {
-+        return cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancelled) {
-+        this.cancelled = cancelled;
-+    }
-+
-+    /**
-+     * Gets the entity that rang the bell.
-+     *
-+     * @return Entity
-+     */
-+    @NotNull
-+    public Entity getEntity() {
-+        return entity;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}

patches/api/0023-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index b42091752..83c51bb5e 100644
+index b4209175..83c51bb5 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 @@ -206,4 +206,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

patches/api/0024-ChatColor-conveniences.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] ChatColor conveniences
 
 
 diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
-index 4594701d7..499b222de 100644
+index 4594701d..499b222d 100644
 --- a/src/main/java/org/bukkit/ChatColor.java
 +++ b/src/main/java/org/bukkit/ChatColor.java
 @@ -413,4 +413,30 @@ public enum ChatColor {

patches/api/0025-DragonEggPlaceEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] DragonEggPlaceEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/block/DragonEggPlaceEvent.java b/src/main/java/net/pl3x/purpur/event/block/DragonEggPlaceEvent.java
 new file mode 100644
-index 000000000..bdabfd2b5
+index 00000000..bdabfd2b
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/block/DragonEggPlaceEvent.java
 @@ -0,0 +1,47 @@

patches/api/0026-Ridables.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Ridables
 
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java
 new file mode 100644
-index 000000000..c0ec5a130
+index 00000000..c0ec5a13
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java
 @@ -0,0 +1,37 @@
@@ -48,10 +48,10 @@ index 000000000..c0ec5a130
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 7808ade92..5abf3eaf3 100644
+index cb9ef706..9c418528 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -695,4 +695,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -691,4 +691,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      public boolean isInLava();
      // Paper end

patches/api/0027-Configurable-permission-message-upgrades.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable permission message upgrades
 This allows the configurable permission message in paper.yml to be blank and also support newlines
 
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index c10fc8d23..882c565ac 100644
+index c10fc8d2..882c565a 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -184,9 +184,13 @@ public abstract class Command {

patches/api/0028-LivingEntity-broadcastItemBreak.patch

@@ -5,13 +5,13 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index a0db76946..7b1cb6623 100644
+index c1eaaca2..97a9ad63 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -785,5 +785,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
-      * @param quantity Quantity of item
+@@ -830,5 +830,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+      * @param safeFallDistance Safe fall distance
       */
-     void playPickupItemAnimation(@NotNull Item item, int quantity);
+     void setSafeFallDistance(float safeFallDistance);
 +
 +    /**
 +     * Play item break animation for the item in specified equipment slot

patches/api/0029-Item-entity-immunities.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Item entity immunities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index acd80d812..810a1e55c 100644
+index acd80d81..810a1e55 100644
 --- a/src/main/java/org/bukkit/entity/Item.java
 +++ b/src/main/java/org/bukkit/entity/Item.java
 @@ -87,4 +87,34 @@ public interface Item extends Entity {