Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes: a9c796f1 SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations 195f071e SPIGOT-4219: Event for PigZombies angering. 5e3082c7 SPIGOT-4230: Improve legacy block types
28 lines
1,009 B
Diff
28 lines
1,009 B
Diff
From 127d86acb4f7b4088c62625044d02ca86aaecc2c Mon Sep 17 00:00:00 2001
|
|
From: Martin Panzer <postremus1996@googlemail.com>
|
|
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 f7a4d53ede..5c26e78a71 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
@@ -136,6 +136,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
|
|
}
|
|
};
|
|
|
|
--
|
|
2.18.0
|
|
|