mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-04-19 17:58:15 +02:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@79c77f5d Pre-Adventure 5.0 changes (#13300) PaperMC/Paper@ad767b0c Fix MC-259832 (#13464) PaperMC/Paper@37e02efd feat: Add new overloads for Pathfinder (#13192) PaperMC/Paper@47aef92a [ci/skip] chore(jd): improve PlayerConnectionValidateLoginEvent (#13591) PaperMC/Paper@13887c99 feature(#13558): add copper golem state api (#13561) PaperMC/Paper@10235641 Fix item entity data serialization to json (#13632) PaperMC/Paper@32dff6b1 Fix crafter slot ID conversions (#13497) PaperMC/Paper@7e80cef5 Add ItemStack getter to FurnaceExactEvent (#13569)
This commit is contained in:
@@ -3,7 +3,7 @@ version = 1.21.11-R0.1-SNAPSHOT
|
|||||||
|
|
||||||
mcVersion = 1.21.11
|
mcVersion = 1.21.11
|
||||||
apiVersion = 1.21.11
|
apiVersion = 1.21.11
|
||||||
paperCommit = 6f71be809ba856c3eb0991a569cd3d890a81ed86
|
paperCommit = 7e80cef5198561d0db53406127e5b8bc7af51577
|
||||||
|
|
||||||
org.gradle.configuration-cache = true
|
org.gradle.configuration-cache = true
|
||||||
org.gradle.caching = true
|
org.gradle.caching = true
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
options.use()
|
options.use()
|
||||||
options.isDocFilesSubDirs = true
|
options.isDocFilesSubDirs = true
|
||||||
options.links(
|
options.links(
|
||||||
@@ -216,11 +_,11 @@
|
@@ -217,11 +_,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
// workaround for https://github.com/gradle/gradle/issues/4046
|
// workaround for https://github.com/gradle/gradle/issues/4046
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/src/main/java/org/bukkit/entity/CopperGolem.java
|
--- a/src/main/java/org/bukkit/entity/CopperGolem.java
|
||||||
+++ b/src/main/java/org/bukkit/entity/CopperGolem.java
|
+++ b/src/main/java/org/bukkit/entity/CopperGolem.java
|
||||||
@@ -39,6 +_,22 @@
|
@@ -53,6 +_,22 @@
|
||||||
*/
|
*/
|
||||||
void setOxidizing(Oxidizing oxidizing);
|
void setOxidizing(Oxidizing oxidizing);
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java
|
||||||
@@ -55,4 +_,17 @@
|
@@ -67,4 +_,17 @@
|
||||||
default -> throw new IllegalStateException("Unexpected value: " + oxidizing);
|
default -> throw new IllegalStateException("Unexpected value: " + oxidizing);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user