diff --git a/gradle.properties b/gradle.properties index 047dbe81a..b1ddbf99e 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-pre4 -paperCommit = 569c3231fb742fdd79af1d115398c1efae48bd90 +mcVersion = 1.21.6-rc1 +paperCommit = c34675541790bbd245f0cee60793c006bdf773bc org.gradle.configuration-cache = true org.gradle.caching = true 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 d720f9fa7..5de962abf 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 @@ -5,14 +5,14 @@ .describedAs("Jar file"); + // Purpur start - Purpur config files -+ acceptsAll(asList("purpur", "purpur-settings"), "File for purpur settings") ++ this.acceptsAll(asList("purpur", "purpur-settings"), "File for purpur settings") + .withRequiredArg() + .ofType(File.class) + .defaultsTo(new File("purpur.yml")) + .describedAs("Yml file"); + // Purpur end - Purpur config files + - acceptsAll(asList("server-name"), "Name of the server") + this.accepts("server-name", "Name of the server") .withRequiredArg() .ofType(String.class) @@ -223,7 +_,7 @@