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 742fb5171cd5cada47c66919b143981cc02598e9 Mon Sep 17 00:00:00 2001
From 7da20b7f3bd17fd2432f48cb077c4370bb39492e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 8 Aug 2019 15:29:15 -0500
Subject: [PATCH] Implement AFK API
@@ -206,10 +206,10 @@ index 96161160bb..762aad378c 100644
if (from.getX() != Double.MAX_VALUE) {
Location oldTo = to.clone();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index b65df63333..8018bf6dd8 100644
index 41179fe312..e82d091746 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -408,7 +408,7 @@ public class WorldServer extends World {
@@ -409,7 +409,7 @@ public class WorldServer extends World {
}
if (this.everyoneSleeping && this.players.stream().noneMatch((entityplayer) -> {
@@ -218,7 +218,7 @@ index b65df63333..8018bf6dd8 100644
})) {
// CraftBukkit start
long l = this.worldData.getDayTime() + 24000L;
@@ -726,7 +726,7 @@ public class WorldServer extends World {
@@ -727,7 +727,7 @@ public class WorldServer extends World {
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -299,5 +299,5 @@ index 7125c0477e..e925e1374d 100644
+ "idle.timeout.broadcast.back": "§e§o%s is no longer AFK"
}
--
2.24.0
2.26.2