Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@94f29035 Do not blow up accessing unregistered memories from API (Fixes #12618) (#12639)
PaperMC/Paper@03efecf0 Do not fire PlayerDropItemEvent for /give command
PaperMC/Paper@3527ccdf feat: expose updateDemand and restock on Villager (#12608)
PaperMC/Paper@320f25cb fix sponge-absorb deleting chest content (#12647)
This commit is contained in:
granny
2025-06-08 12:54:36 -07:00
parent eb0ba67d83
commit 7c6502dc13
9 changed files with 38 additions and 15 deletions

View File

@@ -28,7 +28,7 @@
}
}
}
@@ -165,8 +_,10 @@
@@ -165,16 +_,18 @@
val services = objects.newInstance<Services>()
tasks.withType<Javadoc> {
@@ -40,6 +40,30 @@
options.use()
options.isDocFilesSubDirs = true
options.links(
"https://guava.dev/releases/33.3.1-jre/api/docs/",
- "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
- "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/",
- "https://javadoc.io/doc/org.joml/joml/1.10.8/",
- "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0",
+ // "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
+ // "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/",
+ // "https://javadoc.io/doc/org.joml/joml/1.10.8/",
+ // "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0",
"https://jspecify.dev/docs/api/",
"https://jd.advntr.dev/api/$adventureVersion/",
"https://jd.advntr.dev/key/$adventureVersion/",
@@ -183,9 +_,9 @@
"https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
"https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
"https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
- "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
+ // "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
"https://logging.apache.org/log4j/2.x/javadoc/log4j-api/",
- "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3",
+ // "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3",
)
options.tags("apiNote:a:API Note:")
@@ -199,11 +_,11 @@
}

View File

@@ -1,9 +1,9 @@
--- a/src/main/java/org/bukkit/entity/Villager.java
+++ b/src/main/java/org/bukkit/entity/Villager.java
@@ -391,4 +_,13 @@
* reputation regardless of its impact and the player associated.
@@ -408,4 +_,13 @@
* Demand is still updated even if all events are canceled.
*/
public void clearReputations();
public void restock();
+
+ // Purpur start
+ /**