Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2040c1e Player Flying Fall Damage API (#5357)
PaperMC/Paper@fa42c68 Expose pre-collision moving velocity to VehicleBlockCollisionEvent (#8457)
PaperMC/Paper@90750a6 Rework filtering spawn egg and tile entity nbt config (#6613)

patches/api/0005-Purpur-client-support.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9f762cf670bf5db9138e468e72e57781d8d22f54..b3e2e4a778c94137539c3bcce4a4e0f7c8b3a098 100644
+index de960716478477ce199526b8f860cfafa1541ee9..4d6933038e95f4479a920f3a68db0943c5b1e6a1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2903,4 +2903,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2920,4 +2920,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/api/0010-AFK-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b3e2e4a778c94137539c3bcce4a4e0f7c8b3a098..28d0c2a554ced153b508bea57cfc3ec92b85cc12 100644
+index 4d6933038e95f4479a920f3a68db0943c5b1e6a1..910689c6c76c13660dc1539b0c5384d0c69615f2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2911,5 +2911,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2928,5 +2928,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if Player uses Purpur Client
       */
      public boolean usesPurpurClient();

patches/api/0017-Player-invulnerabilities.patch

@@ -5,10 +5,10 @@ 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 28d0c2a554ced153b508bea57cfc3ec92b85cc12..d9afdcfebb3fa095bd82fb12d5d6836f2ed7741d 100644
+index 910689c6c76c13660dc1539b0c5384d0c69615f2..75ecd5d492ef443a7dc25205ba0796eea34e4ba7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2930,5 +2930,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2947,5 +2947,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();

patches/api/0035-Flying-Fall-Damage-API.patch

@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: TreyRuffy <TreyRuffy@users.noreply.github.com>
-Date: Wed, 9 Jun 2021 16:31:15 -0600
-Subject: [PATCH] Flying Fall Damage API
-
-
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d9afdcfebb3fa095bd82fb12d5d6836f2ed7741d..d76b996e8820e043b85fa5338a837e1a4f196e08 100644
---- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2951,5 +2951,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      * @param invulnerableTicks Invulnerable ticks remaining
-      */
-     void setSpawnInvulnerableTicks(int invulnerableTicks);
-+
-+    /**
-+     * Allows you to enable fall damage while {@link #getAllowFlight()} is {@code true}
-+     *
-+     * @param flyingFallDamage Enables fall damage when {@link #getAllowFlight()} is true
-+     */
-+    public void setFlyingFallDamage(boolean flyingFallDamage);
-+
-+    /**
-+     * Allows you get if fall damage is enabled while {@link #getAllowFlight()} is {@code true}
-+     *
-+     * @return True if fall damage is enabled when {@link #getAllowFlight()} is true
-+     */
-+    public boolean hasFlyingFallDamage();
-     // Purpur end
- }

patches/api/0039-Extended-OfflinePlayer-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Extended OfflinePlayer API
 
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index a7d1f1e701f23e851f735584a30bedadb0d8b9bd..7da38adede5b752583b94f6a14b3e45d0fd10209 100644
+index 69b50eee42e8c52063033705bd23a5ef5231ed83..3578ab0c3a413d56bc39af43b5d3201d20d7d13a 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
 @@ -455,4 +455,114 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio

patches/api/0049-Debug-Marker-API.patch

@@ -260,13 +260,13 @@ index 8effbbd33c0af0ac421e5aef1586e8579ef097e4..0cd49cb31b21e52009f6220d505aa2a3
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d76b996e8820e043b85fa5338a837e1a4f196e08..6782a41eb845c69e9749e340d9fe8d6402caecc2 100644
+index 75ecd5d492ef443a7dc25205ba0796eea34e4ba7..9246df99c4247e361eaa27ea266981b7fec0c14b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2965,5 +2965,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      * @return True if fall damage is enabled when {@link #getAllowFlight()} is true
+@@ -2968,5 +2968,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      * @param invulnerableTicks Invulnerable ticks remaining
       */
-     public boolean hasFlyingFallDamage();
+     void setSpawnInvulnerableTicks(int invulnerableTicks);
 +
 +    /**
 +     * Creates debug block highlight on specified block location and show it to this player.

patches/api/0050-add-Player-showCreditScreen.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] add Player#showCreditScreen
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6782a41eb845c69e9749e340d9fe8d6402caecc2..faa2954f68cf5c675e732bd1c6b456321ccb2ec2 100644
+index 9246df99c4247e361eaa27ea266981b7fec0c14b..0f1d925f9c338427e3fb8cdbbcd37569fc3b30ad 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2411,6 +2411,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2428,6 +2428,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void showDemoScreen();
  

patches/api/0051-Add-death-screen-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index faa2954f68cf5c675e732bd1c6b456321ccb2ec2..18b8b0ee95216c7168d2502c901319f450e6e276 100644
+index 0f1d925f9c338427e3fb8cdbbcd37569fc3b30ad..f65a860d09d9f1d5045b2af63a80109e7c1c4ddf 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3043,5 +3043,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3046,5 +3046,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Clears all debug block highlights
       */
      void clearBlockHighlights();