Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8347)
This commit is contained in:
parent
36a5f150c5
commit
e51401e764
62 changed files with 150 additions and 159 deletions
|
@ -5,10 +5,10 @@ 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 ce104a63cd56f3343a0f58b0d7bcd47d885beb7f..04e7295ab4ec7e417ebb272f5f1b26721dfbb476 100644
|
||||
index 43b8af609fb89cfe23fcab3f741f6dca41888b69..d5f3b44f950ffba5b2680bd2ca5826aae3df2aca 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@@ -154,6 +154,14 @@ public class Main {
|
||||
@@ -156,6 +156,14 @@ public class Main {
|
||||
.defaultsTo(new File[] {})
|
||||
.describedAs("Jar file");
|
||||
// Paper end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue