Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@4511edb8 [ci/skip] Don't promote checking enchantment by legacy lore (#12421)
PaperMC/Paper@8f62e0fb Correctly order getArmorContents
PaperMC/Paper@652cea57 Allow `getAsString()`-ing non-persistent entities (#12424)
PaperMC/Paper@de64e704 Update spark
PaperMC/Paper@1b889688 Add Entity#isTrackedBy (#12332)
PaperMC/Paper@8ff94c63 Update a bunch of dependencies
PaperMC/Paper@79036210 Remove json-simple imports from API, keep it as implementation in server
PaperMC/Paper@dcb755ac Update log4j jd link
PaperMC/Paper@91bfb6fb Fix freeze locked (#12434)
PaperMC/Paper@121a7bf4 Make GameRule a FeatureDependant (#12429)
PaperMC/Paper@7d5695d7 Improve ItemMeta#hasCustomModelData compatibility (#12414)
PaperMC/Paper@de410d13 Fix reobf mappings regression in GameRules.Type (#12437)
PaperMC/Paper@33e8928f Add support for bonus chest configuration in WorldCreator (#12344)
PaperMC/Paper@723b511f Clone exit location passed to teleport event (#12354)
PaperMC/Paper@ed322043 Clone blockpos in InsideBlockEffectApplier record
PaperMC/Paper@6b4ad082 Add PlayerRespawnEvent#isMissingRespawnBlock (#12422)
PaperMC/Paper@c0bd5688 Add logic for Human canUseEquipmentSlot (#12433)
This commit is contained in:
granny
2025-04-14 16:14:25 -07:00
parent f8450874da
commit c3870bda5a
10 changed files with 28 additions and 28 deletions

View File

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

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -4283,6 +_,86 @@
@@ -4290,6 +_,86 @@
@Nullable
public DragonBattle getEnderDragonBattle();

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1215,4 +_,59 @@
@@ -1224,4 +_,59 @@
*/
void broadcastHurtAnimation(@NotNull java.util.Collection<Player> players);
// Paper end - broadcast hurt animation