From 47b4cfb1be56b3ead0a575f5156729bbe60cd4b0 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Wed, 1 Oct 2025 21:58:46 -0700
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@36e0c0ab update enchantment target and rework some component impl
PaperMC/Paper@ce3fe654 fix NPE in legacy profiles
PaperMC/Paper@00bf1284 remove old test
PaperMC/Paper@311810fa fix copper chest inventory
---
 gradle.properties                                           | 2 +-
 .../com/destroystokyo/paper/util/VersionFetcher.java.patch  | 6 +++---
 .../org/bukkit/enchantments/EnchantmentTarget.java.patch    | 4 ++--
 .../java/org/bukkit/plugin/java/LibraryLoader.java.patch    | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 0c767d81c..1cb10a729 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.9-R0.1-SNAPSHOT
 
 mcVersion = 1.21.9
-paperCommit = 27f926e7ecbcfd9c3fe24d53c79a59a141974824
+paperCommit = 311810fa82df6e86dec6e26a72d1a629bda19d09
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true
diff --git a/purpur-api/paper-patches/files/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java.patch b/purpur-api/paper-patches/files/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java.patch
index 50791b448..25a7de1a8 100644
--- a/purpur-api/paper-patches/files/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java.patch
+++ b/purpur-api/paper-patches/files/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java.patch
@@ -10,6 +10,6 @@
 +    }
 +    // Purpur end
 +
-     @ApiStatus.Internal
-     class DummyVersionFetcher implements VersionFetcher {
- 
+     /**
+      * @hidden
+      */
diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java.patch
index 9c9f4c6a9..23ee8f4b5 100644
--- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java.patch
+++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java.patch
@@ -1,8 +1,8 @@
 --- a/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java
 +++ b/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java
-@@ -230,6 +_,30 @@
+@@ -169,6 +_,30 @@
          public boolean includes(@NotNull Material item) {
-             return BREAKABLE.includes(item) || (WEARABLE.includes(item) && !item.equals(Material.ELYTRA)) || item.equals(Material.COMPASS);
+             return Tag.ITEMS_ENCHANTABLE_VANISHING.isTagged(item);
          }
 +        // Purpur start - Add enchantment target for bows and crossbows
 +    },
diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/plugin/java/LibraryLoader.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/plugin/java/LibraryLoader.java.patch
index b25b382f7..29f7d6f64 100644
--- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/plugin/java/LibraryLoader.java.patch
+++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/plugin/java/LibraryLoader.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
-@@ -66,6 +_,7 @@
+@@ -69,6 +_,7 @@
          session.setTransferListener(new AbstractTransferListener() {
              @Override
              public void transferStarted(@NotNull TransferEvent event) {
@@ -8,7 +8,7 @@
                  logger.log(Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName());
              }
          });
-@@ -91,6 +_,7 @@
+@@ -94,6 +_,7 @@
              // Paper end - plugin loader api
              return null;
          }
@@ -16,7 +16,7 @@
          logger.log(Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[]
              {
                  java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), desc.getLibraries().size() // Paper - use configured log prefix
-@@ -143,6 +_,7 @@
+@@ -146,6 +_,7 @@
              }
  
              jarFiles.add(url);