From 75efb975cea26d5bbc9f9850c5e85714ca9d9f5a Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Sun, 23 Mar 2025 17:35:00 -0700
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@bb3b7e69 Fix annotation mistakes
PaperMC/Paper@058455e4 InventoryView QOL open method (#12282)
PaperMC/Paper@f2258582 Fix firework entity not being removed when FireworkExplodeEvent is cancelled (#12268)
PaperMC/Paper@7819df10 Add getHeight method to ChunkData (#12311)
PaperMC/Paper@37b9ca1f Add flush parameter to World#save (#12330)
PaperMC/Paper@515e12ca Check if BUNDLE_CONTENTS is present in InventoryClickEvent (#12321)
PaperMC/Paper@5a6ab97b Add config to remove player as vehicle restriction in /ride (#12327)
PaperMC/Paper@c467df95 Add ItemStack#copyDataFrom (#12224)
---
 gradle.properties                                             | 2 +-
 .../files/src/main/java/org/bukkit/World.java.patch           | 2 +-
 .../src/main/java/org/bukkit/inventory/ItemStack.java.patch   | 4 ++--
 .../org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch | 2 +-
 .../bukkit/craftbukkit/inventory/CraftItemStack.java.patch    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 489f086e5..9cb123ed7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.4-R0.1-SNAPSHOT
 
 mcVersion = 1.21.4
-paperCommit = 2aad131e74f1cf5c8c7c06f57f39c8060561b6c3
+paperCommit = c467df95a29e6c3d42b7e6f49513e924f9ba2ece
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true
diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch
index aaf9c281d..32feb363a 100644
--- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch
+++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4277,6 +_,86 @@
+@@ -4283,6 +_,86 @@
      @Nullable
      public DragonBattle getEnderDragonBattle();
  
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 131717ddc..24a90431c 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
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -21,6 +_,13 @@
+@@ -22,6 +_,13 @@
  import org.bukkit.persistence.PersistentDataContainer;
  import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
@@ -14,7 +14,7 @@
  
  /**
   * Represents a stack of items.
-@@ -1345,4 +_,482 @@
+@@ -1371,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/CraftHumanEntity.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch
index 721712915..4c99c2159 100644
--- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch
+++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -281,6 +_,7 @@
+@@ -284,6 +_,7 @@
      @Override
      public void recalculatePermissions() {
          this.perm.recalculatePermissions();
diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch
index 6c51193da..d67bac8f8 100644
--- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch
+++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -693,4 +_,285 @@
+@@ -713,4 +_,285 @@
      }
  
      // Paper end - data component API