mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 20:50:41 +01:00
0708fa363b
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:eb2e6578SPIGOT-5116: Fix concurrent modification exception inside ChunkMapDistance989f9b3dSPIGOT-4849: Fix server crash when accessing chunks during chunk load/unload/populate eventsf554183cSPIGOT-5171: Don't fire PlayerTeleportEvent if not actually moving2349feb8SPIGOT-5163: Cancelling PlayerBucketFillEvent visually removes the targeted block Spigot Changes: 9a643a6a Remove DataWatcher Locking
28 lines
1,007 B
Diff
28 lines
1,007 B
Diff
From 5ea1c896146e882a1c8debaf9578405d40cf1ed1 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 484f1995a..ad1da9ddd 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.22.0
|
|
|