Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@75bbf4fb Fix infinite loop for legacy wrapper (#13659)
PaperMC/Paper@c58f8443 Check for valid NamespacedKey in OldEnum#valueOf (#13596)
PaperMC/Paper@3f5728e2 Cleanup CLI args (#13646)
This commit is contained in:
granny
2026-03-03 03:44:39 +00:00
parent e2fb2be5a7
commit 0fbf8d2312
5 changed files with 6 additions and 6 deletions

View File

@@ -3,7 +3,7 @@ version = 1.21.11-R0.1-SNAPSHOT
mcVersion = 1.21.11 mcVersion = 1.21.11
apiVersion = 1.21.11 apiVersion = 1.21.11
paperCommit = 7e80cef5198561d0db53406127e5b8bc7af51577 paperCommit = 3f5728e24942a470a428c60839eda5340f85f9f8
org.gradle.configuration-cache = true org.gradle.configuration-cache = true
org.gradle.caching = true org.gradle.caching = true

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/entity/Villager.java --- a/src/main/java/org/bukkit/entity/Villager.java
+++ b/src/main/java/org/bukkit/entity/Villager.java +++ b/src/main/java/org/bukkit/entity/Villager.java
@@ -406,4 +_,13 @@ @@ -409,4 +_,13 @@
* Demand is still updated even if all events are canceled. * Demand is still updated even if all events are canceled.
*/ */
public void restock(); public void restock();

View File

@@ -1,7 +1,7 @@
--- a/src/main/java/org/bukkit/entity/Wolf.java --- a/src/main/java/org/bukkit/entity/Wolf.java
+++ b/src/main/java/org/bukkit/entity/Wolf.java +++ b/src/main/java/org/bukkit/entity/Wolf.java
@@ -162,4 +_,20 @@ @@ -163,4 +_,20 @@
return RegistryAccess.registryAccess().getRegistry(RegistryKey.WOLF_SOUND_VARIANT).getOrThrow(NamespacedKey.minecraft(key)); return RegistryAccess.registryAccess().getRegistry(RegistryKey.WOLF_SOUND_VARIANT).getOrThrow(Key.key(Key.MINECRAFT_NAMESPACE, key));
} }
} }
+ +

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/craftbukkit/Main.java --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -169,6 +_,14 @@ @@ -139,6 +_,14 @@
.defaultsTo(new File[] {}) .defaultsTo(new File[] {})
.describedAs("Plugin directory"); .describedAs("Plugin directory");

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -487,7 +_,7 @@ @@ -485,7 +_,7 @@
@Override @Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {