From c07b0a3c32c98c7d6caa04d957df8975f5cf6361 Mon Sep 17 00:00:00 2001 From: MrPowerGamerBR Date: Wed, 23 Apr 2025 15:47:07 -0300 Subject: [PATCH] Fix SparklyPaper config files patch because it had a git conflict diff inside of it for... some reason --- .../0002-SparklyPaper-config-files.patch | 50 ++++--------------- 1 file changed, 11 insertions(+), 39 deletions(-) diff --git a/sparklypaper-server/paper-patches/features/0002-SparklyPaper-config-files.patch b/sparklypaper-server/paper-patches/features/0002-SparklyPaper-config-files.patch index f90314a..7d21474 100644 --- a/sparklypaper-server/paper-patches/features/0002-SparklyPaper-config-files.patch +++ b/sparklypaper-server/paper-patches/features/0002-SparklyPaper-config-files.patch @@ -41,49 +41,21 @@ index 71f7a8386d616420a0e86233e721f55ab62aae4d..349d75dd25e01031a455bc0d6e86d994 this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index a11fc64b4933a5abce0182ba46f1da22043eb0d8..66f654c8f4617a5b9c8e701bc31151078ef72287 100644 +index a11fc64b4933a5abce0182ba46f1da22043eb0d8..941b27a2e06590ec4ec94e56e7f82af987669df4 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -165,6 +165,42 @@ public class Main { +@@ -164,6 +164,14 @@ public class Main { + .ofType(File.class) .defaultsTo(new File[] {}) .describedAs("Jar file"); ++ ++ // SparklyPaper start ++ acceptsAll(asList("sparklypaper", "sparklypaper-settings"), "File for SparklyPaper settings") ++ .withRequiredArg() ++ .ofType(File.class) ++ .defaultsTo(new File("sparklypaper.yml")) ++ .describedAs("Yml file"); ++ // SparklyPaper end -+<<<<<<< HEAD -+======= -+ // SparklyPaper Start -+ acceptsAll(asList("sparklypaper", "sparklypaper-settings"), "File for SparklyPaper settings") -+ .withRequiredArg() -+ .ofType(File.class) -+ .defaultsTo(new File("sparklypaper.yml")) -+ .describedAs("Yml file"); -+ // SparklyPaper end -+ -+ // SparklyPaper Start -+ acceptsAll(asList("sparklypaper", "sparklypaper-settings"), "File for SparklyPaper settings") -+ .withRequiredArg() -+ .ofType(File.class) -+ .defaultsTo(new File("sparklypaper.yml")) -+ .describedAs("Yml file"); -+ // SparklyPaper end -+ -+ // SparklyPaper Start -+ acceptsAll(asList("sparklypaper", "sparklypaper-settings"), "File for SparklyPaper settings") -+ .withRequiredArg() -+ .ofType(File.class) -+ .defaultsTo(new File("sparklypaper.yml")) -+ .describedAs("Yml file"); -+ // SparklyPaper end -+ -+ // SparklyPaper Start -+ acceptsAll(asList("sparklypaper", "sparklypaper-settings"), "File for SparklyPaper settings") -+ .withRequiredArg() -+ .ofType(File.class) -+ .defaultsTo(new File("sparklypaper.yml")) -+ .describedAs("Yml file"); -+ // SparklyPaper end -+ -+ // Paper start -+>>>>>>> SparklyPaper config files acceptsAll(asList("server-name"), "Name of the server") .withRequiredArg() - .ofType(String.class)