Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@07679026 CraftBlock - fix applyBoneMeal false result (#12407)
PaperMC/Paper@f00727c5 1.21.5
PaperMC/Paper@8eede4bb Fix AbstractHorse get/setSaddle
PaperMC/Paper@93b6829e Also fix AbstractHorse getSize and isEmpty
PaperMC/Paper@f517267c Add passthrough for air serialization
This commit is contained in:
granny
2025-04-12 22:23:06 -07:00
parent f5a9280b2f
commit f8450874da
5 changed files with 8 additions and 8 deletions

View File

@@ -1,6 +1,6 @@
--- a/paper-api/build.gradle.kts
+++ b/paper-api/build.gradle.kts
@@ -93,7 +_,7 @@
@@ -97,7 +_,7 @@
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}
@@ -9,7 +9,7 @@
idea {
module {
generatedSourceDirs.add(generatedDir.toFile())
@@ -103,6 +_,18 @@
@@ -107,6 +_,18 @@
main {
java {
srcDir(generatedDir)
@@ -28,7 +28,7 @@
}
}
}
@@ -168,8 +_,10 @@
@@ -172,8 +_,10 @@
val services = objects.newInstance<Services>()
tasks.withType<Javadoc> {
@@ -40,7 +40,7 @@
options.use()
options.isDocFilesSubDirs = true
options.links(
@@ -202,11 +_,11 @@
@@ -206,11 +_,11 @@
}
// workaround for https://github.com/gradle/gradle/issues/4046

View File

@@ -14,7 +14,7 @@
/**
* Represents a stack of items.
@@ -1372,4 +_,482 @@
@@ -1363,4 +_,482 @@
return this.craftDelegate.matchesWithoutData(item, excludeTypes, ignoreCount);
}
// Paper end - data component API