Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
b6cf80ee Preload important classes such as Logger and JLine
ea1a909c Fix netty version to 50 and restore epoll native support
10502558 Workaround for some hacky environments that mess up things
8b2a437b Fix plugins calling getChunkAtAsync asynchronously
c8055836 Update Netty to 4.1.51
64cfcf3e Optimize sending packets to nearby locations (sounds/effects)
This commit is contained in:
William Blake Galbreath
2020-05-24 18:26:13 -05:00
parent 3e808f90ec
commit 16eea718fa
8 changed files with 30 additions and 30 deletions

View File

@@ -1,4 +1,4 @@
From 176ac13ebc4fd1146e653cd6146f63a7f268a7bf Mon Sep 17 00:00:00 2001
From 3fbe26f37974416a29492fdb5d055a87e68eec9c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Wed, 22 Jan 2020 20:13:40 -0600
Subject: [PATCH] UPnP Port Forwarding Service
@@ -14,7 +14,7 @@ Subject: [PATCH] UPnP Port Forwarding Service
create mode 100644 src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
diff --git a/pom.xml b/pom.xml
index 7f251e739..c1d87f951 100644
index d5709e670..43d6bed36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,12 @@
@@ -30,7 +30,7 @@ index 7f251e739..c1d87f951 100644
<!-- Purpur end -->
<dependency>
<groupId>net.minecrell</groupId>
@@ -162,6 +168,10 @@
@@ -167,6 +173,10 @@
<id>spigotmc-public</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
@@ -78,7 +78,7 @@ index 73d2b32c5..a522ed5c3 100644
// this.a((PlayerList) (new DedicatedPlayerList(this))); // Spigot - moved up
server.loadPlugins();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 378fd60db..d00852a12 100644
index 303778dcd..03dc148ad 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -187,6 +187,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas