Repo-Mirror/SparklyPaperMC
9
0
Fork 0
mirror of https://github.com/SparklyPower/SparklyPaper.git synced 2025-12-31 21:06:36 +00:00
Code Issues Releases Activity

Fix SparklyPaper config files patch because it had a git conflict diff inside of it for... some reason

Browse Source
This commit is contained in:
MrPowerGamerBR
2025-04-23 15:47:07 -03:00
parent 09aebcf7f5
commit c07b0a3c32
1 changed files with 11 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
sparklypaper-server/paper-patches/features/0002-SparklyPaper-config-files.patch
View File

@@ -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)