Skip to content

Commit f845087

Browse files
committed
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
1 parent f5a9280 commit f845087

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
22
version = 1.21.5-R0.1-SNAPSHOT
33

44
mcVersion = 1.21.5
5-
paperCommit = 62256c5182f0c12ca286708e9e7ac5e8f442fcd3
5+
paperCommit = f517267c0cde36a82419ebe04038d77424779acc
66

77
org.gradle.configuration-cache = true
88
org.gradle.caching = true

purpur-api/build.gradle.kts.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/paper-api/build.gradle.kts
22
+++ b/paper-api/build.gradle.kts
3-
@@ -93,7 +_,7 @@
3+
@@ -97,7 +_,7 @@
44
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
55
}
66

@@ -9,7 +9,7 @@
99
idea {
1010
module {
1111
generatedSourceDirs.add(generatedDir.toFile())
12-
@@ -103,6 +_,18 @@
12+
@@ -107,6 +_,18 @@
1313
main {
1414
java {
1515
srcDir(generatedDir)
@@ -28,7 +28,7 @@
2828
}
2929
}
3030
}
31-
@@ -168,8 +_,10 @@
31+
@@ -172,8 +_,10 @@
3232
val services = objects.newInstance<Services>()
3333

3434
tasks.withType<Javadoc> {
@@ -40,7 +40,7 @@
4040
options.use()
4141
options.isDocFilesSubDirs = true
4242
options.links(
43-
@@ -202,11 +_,11 @@
43+
@@ -206,11 +_,11 @@
4444
}
4545

4646
// workaround for https://github.com/gradle/gradle/issues/4046

purpur-api/paper-patches/files/src/main/java/org/bukkit/inventory/ItemStack.java.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

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

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
22
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
3-
@@ -89,4 +_,17 @@
3+
@@ -92,4 +_,17 @@
44
public Llama getCaravanTail() {
55
return this.getHandle().caravanTail == null ? null : (Llama) this.getHandle().caravanTail.getBukkitEntity();
66
}

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
22
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
3-
@@ -481,7 +_,7 @@
3+
@@ -484,7 +_,7 @@
44

55
@Override
66
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

0 commit comments

Comments
 (0)