aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorZach <[email protected]>2016-05-29 18:35:03 -0500
committerZach <[email protected]>2016-05-29 18:35:03 -0500
commita272c3c0cbbedcbd3748a05a080698b0e87cdcd5 (patch)
treea219f18a3b80acdd2d05734d8a3e45ca7014a163
parent0ae5768736a17eb7b7af907e1b7d345754cdc53a (diff)
parent7add3186a736ed72a15d72c12ed33be36576b4f6 (diff)
downloadPaper-a272c3c0cbbedcbd3748a05a080698b0e87cdcd5.tar.gz
Paper-a272c3c0cbbedcbd3748a05a080698b0e87cdcd5.zip
Merge pull request #310 from MyPlayPlanet/server-name-param
Add server-name as server parameter
-rw-r--r--Spigot-Server-Patches/0161-Add-server-name-parameter.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0161-Add-server-name-parameter.patch b/Spigot-Server-Patches/0161-Add-server-name-parameter.patch
new file mode 100644
index 0000000000..b54a526c03
--- /dev/null
+++ b/Spigot-Server-Patches/0161-Add-server-name-parameter.patch
@@ -0,0 +1,28 @@
+From 2f122ad5d0c01346958f8df83947936b53b75236 Mon Sep 17 00:00:00 2001
+From: Martin Panzer <[email protected]>
+Date: Sat, 28 May 2016 16:54:03 +0200
+Subject: [PATCH] Add server-name parameter
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index 979adad..2aad1e8 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -130,6 +130,14 @@ public class Main {
+ .defaultsTo(new File("paper.yml"))
+ .describedAs("Yml file");
+ // Paper end
++
++ // Paper start
++ acceptsAll(asList("server-name"), "Name of the server")
++ .withRequiredArg()
++ .ofType(String.class)
++ .defaultsTo("Unknown Server")
++ .describedAs("Name");
++ // Paper end
+ }
+ };
+
+--
+1.9.1
+