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 11137688efbe226b4c00fd1e9e2a2a0796b0c025 Mon Sep 17 00:00:00 2001
From fad7117f1f0a960e444b059b3ef72357a008826e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:02:11 -0500
Subject: [PATCH] Rebrand
@@ -15,7 +15,7 @@ Subject: [PATCH] Rebrand
create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
diff --git a/pom.xml b/pom.xml
index 1ae57e8ab..7f251e739 100644
index e4c63bb76..d5709e670 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
@@ -75,7 +75,7 @@ index 1ae57e8ab..7f251e739 100644
<dependency>
<groupId>net.minecrell</groupId>
<artifactId>terminalconsoleappender</artifactId>
@@ -159,7 +173,7 @@
@@ -164,7 +178,7 @@
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
<build>
@@ -84,7 +84,7 @@ index 1ae57e8ab..7f251e739 100644
<defaultGoal>clean install</defaultGoal> <!-- Paper -->
<plugins>
<plugin>
@@ -167,7 +181,7 @@
@@ -172,7 +186,7 @@
<artifactId>gitdescribe-maven-plugin</artifactId>
<version>1.3</version>
<configuration>
@@ -107,7 +107,7 @@ index cd6e25923..bb227bc0f 100644
);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 3ec164785..92677b38b 100644
index 5b24de6d6..5cd342eda 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1559,7 +1559,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -254,7 +254,7 @@ index 894917c88..648dde01a 100644
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 549ba4d80..3c7cb4e3f 100644
index b58f2ef5c..fefa718df 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -306,7 +306,7 @@ public final class CraftMagicNumbers implements UnsafeValues {