diff --git a/gradle.properties b/gradle.properties index 13180a64b..560ecf900 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.21.1-R0.1-SNAPSHOT mcVersion = 1.21.1 -paperCommit = 958666a8f6ab8b45652d1a682b25e42100bcb0da +paperCommit = 70dfa467e796a0dfaf74147fe3560e07a5816054 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0022-Disable-outdated-build-check.patch b/patches/server/0022-Disable-outdated-build-check.patch index 9d555ab01..575b111ce 100644 --- a/patches/server/0022-Disable-outdated-build-check.patch +++ b/patches/server/0022-Disable-outdated-build-check.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable outdated build check diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 1950f81bd8682757dd1dd6de0bc9664fcccd0ea3..8fe2e71f001b37a5e9a08d397cd32cf98eeae9ac 100644 +index 22bdc8fe2796940eb971437e1c97d638bfbc42bb..316c5e1460ccf3386c4c8623eabb7f087df8c4b9 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -254,7 +254,7 @@ public class Main { +@@ -267,7 +267,7 @@ public class Main { System.setProperty(net.minecrell.terminalconsole.TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper } diff --git a/patches/server/0182-Summoner-API.patch b/patches/server/0182-Summoner-API.patch index 1a2b99ee2..8b1bab34b 100644 --- a/patches/server/0182-Summoner-API.patch +++ b/patches/server/0182-Summoner-API.patch @@ -210,13 +210,13 @@ index 63cae1a2e95d8da17c45c4404a8dd0ca6a413c39..966587c2788b5c93be83259ddc962a89 + // Purpur end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java -index 05cee4906169425ee6e80cf1302f2fa01f09d58f..a21690ef9dc8b64249ce75a47bd3ce0c7aa0913f 100644 +index 4ce2373ff71c3c1b8951646e057587a3ab09e145..4f7f6cf6ca24406570d2d29dc63dc89401119961 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java -@@ -40,4 +40,17 @@ public class CraftSnowman extends CraftGolem implements Snowman, com.destroystok - return this.isDerp(); +@@ -28,4 +28,17 @@ public class CraftSnowman extends CraftGolem implements Snowman, com.destroystok + public String toString() { + return "CraftSnowman"; } - // Paper end + + // Purpur start + @Override