Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
34e5942b Fix timings task name generation for extreme cases - Fixes #3499
5e3bacbc Ensure ThreadDeath propagates fully - Fixes #3521
9fa6ba26 Optimize Light Engine
dfd3848e Use seed based lookup for Treasure Maps - Fixes lag from carto/sunken maps
74dcb3c9 Revert "Fix enchantment costs (#3519)"
6d72ea16 Fix enchantment costs (#3519)
68cc8d79 Maps shouldn't load chunks (#3518)
e7cf34a0 Fix villager trading demand MC-163962 (#3498)
51f9edf2 Change name and id to get from profile in AsyncPlayerPreLoginEvent (#3511)
This commit is contained in:
William Blake Galbreath
2020-06-08 15:49:24 -05:00
parent eb7806de67
commit 1564cefa74
15 changed files with 59 additions and 59 deletions

View File

@@ -1,4 +1,4 @@
From d758a1fb984a3aeab4c5c266153006a8c254028c Mon Sep 17 00:00:00 2001
From 93bef04f9845d383a377947d578dd0a30a71ab31 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 16 Jan 2020 14:59:16 -0600
Subject: [PATCH] Make the GUI better
@@ -88,10 +88,10 @@ index cf5abd393e..73d2b32c5c 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d7e29a59de..d9407aedbf 100644
index 88333e3aeb..1d22c2044d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1366,6 +1366,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1374,6 +1374,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
return true;
}
@@ -1201,5 +1201,5 @@ index 476f4a5cbe..522048dc9e 100644
<TerminalConsole name="TerminalConsole">
<PatternLayout>
--
2.24.0
2.26.2