diff --git a/gradle.properties b/gradle.properties index 317e9428b..047dbe81a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ group = org.purpurmc.purpur version = 1.21.6-R0.1-SNAPSHOT -mcVersion = 1.21.6-pre3 -paperCommit = 6101c8af5bac6ba2b8ed6c50cf4d219ce3d07352 +mcVersion = 1.21.6-pre4 +paperCommit = 569c3231fb742fdd79af1d115398c1efae48bd90 org.gradle.configuration-cache = true org.gradle.caching = true diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch index 64546e194..3854c7295 100644 --- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch +++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -4290,6 +_,86 @@ +@@ -4308,6 +_,86 @@ @Nullable public DragonBattle getEnderDragonBattle(); diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch index ed8da8e31..d720f9fa7 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -165,6 +_,14 @@ +@@ -164,6 +_,14 @@ .defaultsTo(new File[] {}) .describedAs("Jar file"); @@ -15,7 +15,7 @@ acceptsAll(asList("server-name"), "Name of the server") .withRequiredArg() .ofType(String.class) -@@ -224,7 +_,7 @@ +@@ -223,7 +_,7 @@ System.setProperty(net.minecrell.terminalconsole.TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper }