core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ci-skip] Fix description of add-plugin command line option (#6031)

This commit is contained in:
Jason 2021-06-29 02:09:02 -07:00 committed by GitHub
parent 59371cbd88
commit 1d194e5605
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0687-Add-command-line-option-to-load-extra-plugin-jars-no.patch
View File

@ -7,7 +7,7 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0811c2804820b1dc0c49a354216b8d4eabc451c0..0e11c5f2e11a0d75740c8810421bd935691f47b5 100644 index b483289bf016317d6ccb8baad2504e9091d72c5b..21f64f879ab71fd40d3f5bb1d0ded4e5802ae373 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -385,8 +385,13 @@ public final class CraftServer implements Server { @@ -385,8 +385,13 @@ public final class CraftServer implements Server {
@ -46,7 +46,7 @@ index 0811c2804820b1dc0c49a354216b8d4eabc451c0..0e11c5f2e11a0d75740c8810421bd935
if (type == PluginLoadOrder.STARTUP) { if (type == PluginLoadOrder.STARTUP) {
this.helpMap.clear(); this.helpMap.clear();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index daa881823f9a0757211e4fece8ebd9225f8b41bb..32f82c60b680180b256edff127e5a6ded42fccf4 100644 index daa881823f9a0757211e4fece8ebd9225f8b41bb..d92a7e8e4f5a6e794ae4563f17a817ace36da73e 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -153,6 +153,12 @@ public class Main { @@ -153,6 +153,12 @@ public class Main {
@ -54,11 +54,11 @@ index daa881823f9a0757211e4fece8ebd9225f8b41bb..32f82c60b680180b256edff127e5a6de
.defaultsTo("Unknown Server") .defaultsTo("Unknown Server")
.describedAs("Name"); .describedAs("Name");
+ +
+ acceptsAll(asList("add-plugin", "add-extra-plugin-jar")) + acceptsAll(asList("add-plugin", "add-extra-plugin-jar"), "Specify paths to extra plugin jars to be loaded in addition to those in the plugins folder. This argument can be specified multiple times, once for each extra plugin jar path.")
+ .withRequiredArg() + .withRequiredArg()
+ .ofType(File.class) + .ofType(File.class)
+ .defaultsTo(new File[] {}) + .defaultsTo(new File[] {})
+ .describedAs("Specify paths to extra plugin jars to be loaded in addition to those in the plugins folder. This argument can be specified multiple times, once for each extra plugin jar path."); + .describedAs("Jar file");
// Paper end // Paper end
} }
}; };