mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 17:37:42 +01:00
Update to 1.21.10 & Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@0ff899da Prevent world mutation on copper golem spawn cancel (#13152) PaperMC/Paper@bae47d3e Update to 1.21.10 (#13127) PaperMC/Paper@8339bb31 Update DataConverter constants for 1.21.10 PaperMC/Paper@3982efa0 Sync Moonrise PaperMC/Paper@fa57d4b7 Remove Vanilla packet processing at start of tick PaperMC/Paper@fba780d6 Rebuild patches
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/paper-api/build.gradle.kts
|
||||
+++ b/paper-api/build.gradle.kts
|
||||
@@ -90,7 +_,7 @@
|
||||
@@ -89,7 +_,7 @@
|
||||
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
idea {
|
||||
module {
|
||||
generatedSourceDirs.add(generatedDir.toFile())
|
||||
@@ -100,6 +_,18 @@
|
||||
@@ -99,6 +_,18 @@
|
||||
main {
|
||||
java {
|
||||
srcDir(generatedDir)
|
||||
@@ -28,7 +28,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -165,8 +_,9 @@
|
||||
@@ -164,8 +_,9 @@
|
||||
val services = objects.newInstance<Services>()
|
||||
|
||||
tasks.withType<Javadoc>().configureEach {
|
||||
@@ -39,7 +39,7 @@
|
||||
options.use()
|
||||
options.isDocFilesSubDirs = true
|
||||
options.links(
|
||||
@@ -201,11 +_,11 @@
|
||||
@@ -198,11 +_,11 @@
|
||||
}
|
||||
|
||||
// workaround for https://github.com/gradle/gradle/issues/4046
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
@@ -1474,4 +_,20 @@
|
||||
@@ -1494,4 +_,20 @@
|
||||
*/
|
||||
@ApiStatus.Experimental
|
||||
@NotNull CombatTracker getCombatTracker();
|
||||
|
||||
Reference in New Issue
Block a user