From f8450874da4e2d29863b544b70cc7b962a04aa70 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Sat, 12 Apr 2025 22:23:06 -0700
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@07679026 CraftBlock - fix applyBoneMeal false result (#12407)
PaperMC/Paper@f00727c5 1.21.5
PaperMC/Paper@8eede4bb Fix AbstractHorse get/setSaddle
PaperMC/Paper@93b6829e Also fix AbstractHorse getSize and isEmpty
PaperMC/Paper@f517267c Add passthrough for air serialization
---
 gradle.properties                                         | 2 +-
 purpur-api/build.gradle.kts.patch                         | 8 ++++----
 .../main/java/org/bukkit/inventory/ItemStack.java.patch   | 2 +-
 .../org/bukkit/craftbukkit/entity/CraftLlama.java.patch   | 2 +-
 .../bukkit/craftbukkit/util/CraftMagicNumbers.java.patch  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 397a23217..60d1e9add 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.5-R0.1-SNAPSHOT
 
 mcVersion = 1.21.5
-paperCommit = 62256c5182f0c12ca286708e9e7ac5e8f442fcd3
+paperCommit = f517267c0cde36a82419ebe04038d77424779acc
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true
diff --git a/purpur-api/build.gradle.kts.patch b/purpur-api/build.gradle.kts.patch
index d09f1f271..c6df50f08 100644
--- a/purpur-api/build.gradle.kts.patch
+++ b/purpur-api/build.gradle.kts.patch
@@ -1,6 +1,6 @@
 --- a/paper-api/build.gradle.kts
 +++ b/paper-api/build.gradle.kts
-@@ -93,7 +_,7 @@
+@@ -97,7 +_,7 @@
      testRuntimeOnly("org.junit.platform:junit-platform-launcher")
  }
  
@@ -9,7 +9,7 @@
  idea {
      module {
          generatedSourceDirs.add(generatedDir.toFile())
-@@ -103,6 +_,18 @@
+@@ -107,6 +_,18 @@
      main {
          java {
              srcDir(generatedDir)
@@ -28,7 +28,7 @@
          }
      }
  }
-@@ -168,8 +_,10 @@
+@@ -172,8 +_,10 @@
  val services = objects.newInstance<Services>()
  
  tasks.withType<Javadoc> {
@@ -40,7 +40,7 @@
      options.use()
      options.isDocFilesSubDirs = true
      options.links(
-@@ -202,11 +_,11 @@
+@@ -206,11 +_,11 @@
      }
  
      // workaround for https://github.com/gradle/gradle/issues/4046
diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/inventory/ItemStack.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/inventory/ItemStack.java.patch
index 5c0dae4d0..6726eb6ef 100644
--- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/inventory/ItemStack.java.patch
+++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/inventory/ItemStack.java.patch
@@ -14,7 +14,7 @@
  
  /**
   * Represents a stack of items.
-@@ -1372,4 +_,482 @@
+@@ -1363,4 +_,482 @@
          return this.craftDelegate.matchesWithoutData(item, excludeTypes, ignoreCount);
      }
      // Paper end - data component API
diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch
index c5db6e7ee..aad4d7f90 100644
--- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch
+++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-@@ -89,4 +_,17 @@
+@@ -92,4 +_,17 @@
      public Llama getCaravanTail() {
          return this.getHandle().caravanTail == null ? null : (Llama) this.getHandle().caravanTail.getBukkitEntity();
      }
diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch
index 2caad1ea9..d622f147d 100644
--- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch
+++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -481,7 +_,7 @@
+@@ -484,7 +_,7 @@
  
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {