Update to 1.18.1 (#7076)

This commit is contained in:
Nassim Jahnke 2021-12-10 15:24:07 +01:00 committed by GitHub
parent dce79f333c
commit 1c779c2d2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
146 changed files with 568 additions and 588 deletions

View file

@ -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 6300161cafb6efed7a262fa6b0b17d2f471fb2bb..ed842f74fbd2de066cfbf8522c638ff2942e8197 100644
index e6362865d1e7beac23e520ebd2deb8a356428045..60ccdf33a014f3488353045e30526bc3f16e93c5 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -151,6 +151,14 @@ public class Main {
@@ -149,6 +149,14 @@ public class Main {
.defaultsTo(new File[] {})
.describedAs("Jar file");
// Paper end