Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@52a60ad Updated Upstream (Bukkit/CraftBukkit) (#8172)
PaperMC/Paper@5deafd1 Teleportation API (#6562)

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 c0fc38cacf441273e8430dda31958c15a48fc9b6..8bcf8ca71101988342d4c01c6943977d14ea60b6 100644
+index b39afbcd1fa88a7f00cd5f4482d52f2d089497dc..d9b0c214ab906e458b042a6762f5c84a8b98e55d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2705,4 +2705,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2770,4 +2770,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/api/0007-Ridables.patch

@@ -22,10 +22,10 @@ index 8fd399f791b45eb7fc62693ca954eea0c68e2881..22705359d5b3b1af522ff5575c07ca5e
       * @deprecated removed in 1.16
       */
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 8bc6876c82935988436597161fa0ec94c032174b..db83f87af0cb75b275bba306dea38b66907bbb56 100644
+index 03b35d3ba8ba00c0fa0272450f19355244a014ea..79990a193443ed4c619a25ae1b4c18d46e8dcc83 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -830,4 +830,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -897,4 +897,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      boolean isInPowderedSnow();
      // Paper 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 8bcf8ca71101988342d4c01c6943977d14ea60b6..a262a1d3c2ad43ab163817967e06e7067cba3733 100644
+index d9b0c214ab906e458b042a6762f5c84a8b98e55d..4aa9b09749763298bbdc93c87fb353c7fe40dd8a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2713,5 +2713,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2778,5 +2778,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 a262a1d3c2ad43ab163817967e06e7067cba3733..3f032de55933706c4fc054e58605e1ffd18a3bf5 100644
+index 4aa9b09749763298bbdc93c87fb353c7fe40dd8a..395b4e7218e5f252f81d098264a2a917c63c12b0 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2732,5 +2732,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2797,5 +2797,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();

patches/api/0028-Rabid-Wolf-API.patch

@@ -17,13 +17,13 @@ index 2a8c6da0f9ffa1f94cfd37d1068511c8941d27ce..aa0a081819672c14d9f04c07f4685768
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Wolf.java b/src/main/java/org/bukkit/entity/Wolf.java
-index 297b65a6cf7d25f02bbd824ea507c5c083e0abec..f5f751678f3d14d2dcb8727c7e9d9db1ab1a44a7 100644
+index 84db38388bf7a58e66d6cd29620b4fe64b0a897e..82ebd99549ce9f9e6427a50cef424e9007735708 100644
 --- a/src/main/java/org/bukkit/entity/Wolf.java
 +++ b/src/main/java/org/bukkit/entity/Wolf.java
-@@ -59,4 +59,20 @@ public interface Wolf extends Tameable, Sittable, io.papermc.paper.entity.Collar
+@@ -69,4 +69,20 @@ public interface Wolf extends Tameable, Sittable, io.papermc.paper.entity.Collar
+      * @param interested Whether the wolf is interested
       */
-     boolean isInterested();
-     // Paper end
+     public void setInterested(boolean interested);
 +
 +    // Purpur start
 +    /**

patches/api/0034-API-for-any-mob-to-burn-daylight.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
 Co-authored by: Encode42 <me@encode42.dev>
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index db83f87af0cb75b275bba306dea38b66907bbb56..3fa4f583c8d38c8cb62065f7f18986c985e4c92f 100644
+index 79990a193443ed4c619a25ae1b4c18d46e8dcc83..ffd3d7f4c0c86806bcf70bd90edf3041834d401c 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -860,5 +860,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -927,5 +927,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * @return True if ridable in water
       */
      boolean isRidableInWater();

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

@@ -5,10 +5,10 @@ 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 3f032de55933706c4fc054e58605e1ffd18a3bf5..2436ece75493dc05352dfa0027b98aaeaab0d5f7 100644
+index 395b4e7218e5f252f81d098264a2a917c63c12b0..8bf04a0ad920fa580568713b243c20c448435908 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2753,5 +2753,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2818,5 +2818,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param invulnerableTicks Invulnerable ticks remaining
       */
      void setSpawnInvulnerableTicks(int invulnerableTicks);