Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a76998d Fix plugin loggers on shutdown (#5592)
This commit is contained in:
BillyGalbreath
2022-08-22 15:55:20 -05:00
parent e599e96628
commit 868748e16f
17 changed files with 64 additions and 64 deletions

View File

@@ -105,7 +105,7 @@ index b6f5d2aa4c6edb61421a553211ce71592d8c767a..9d68706d23da00700a89b533e9efefa3
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7424f3f2f9942170d1f0b98e61b5712901d2fd60..c1a8ac2abf79075f4ea70d2cfe1fc577e0e92271 100644
index 27b2416f725a57fcdc14378e7c14713978e51783..14669d51d624e7af1a06cff07f451524160687b3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -961,6 +961,7 @@ public final class CraftServer implements Server {
@@ -152,10 +152,10 @@ index 7424f3f2f9942170d1f0b98e61b5712901d2fd60..c1a8ac2abf79075f4ea70d2cfe1fc577
public void restart() {
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 5b48047242e20c216b110502935763ea433c55cd..40d86147d4bfcab81c2b4e2d70f5ccdb8e25e606 100644
index 56a784e943cb5d8b15b41e3e66545ebf166c221c..64489713611840abb069957dcdb495c60c990059 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -158,6 +158,14 @@ public class Main {
@@ -164,6 +164,14 @@ public class Main {
.describedAs("Jar file");
// Paper end