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
This commit is contained in:
granny
2025-10-01 21:58:46 -07:00
parent b211823008
commit 47b4cfb1be
4 changed files with 9 additions and 9 deletions

View File

@@ -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

View File

@@ -10,6 +10,6 @@
+ }
+ // Purpur end
+
@ApiStatus.Internal
class DummyVersionFetcher implements VersionFetcher {
/**
* @hidden
*/

View File

@@ -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
+ },

View File

@@ -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);