Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
d63075df Pass fireworks through vanished players (#3021)
4d991f19 [CI-SKIP] Rebuild patches
26070a0e Indicate ticking status in entity list command (#2856)
2ff7b480 Optimise Chunk#getFluid (#2860)
c23ebb78 Optimise ticklistserver (#2957)
This commit is contained in:
William Blake Galbreath
2020-03-18 23:48:24 -05:00
parent 87559bd84c
commit 2ccfff0b5c
10 changed files with 69 additions and 420 deletions

View File

@@ -1,4 +1,4 @@
From e7e9bd131a20909782422715828c3bc79b2c430d Mon Sep 17 00:00:00 2001
From bfec24048fcbf8603ebc427e8f8a018c38248df4 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
@@ -192,10 +192,10 @@ index 67afa457e8..2659da1881 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 d6472905a2..22a1c4ebfa 100644
index 8eae813adc..baa0f885e5 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -745,7 +745,7 @@ public class WorldServer extends World {
@@ -746,7 +746,7 @@ public class WorldServer extends World {
}
if (this.everyoneSleeping && this.players.stream().noneMatch((entityplayer) -> {
@@ -204,7 +204,7 @@ index d6472905a2..22a1c4ebfa 100644
})) {
// CraftBukkit start
long l = this.worldData.getDayTime() + 24000L;
@@ -1050,7 +1050,7 @@ public class WorldServer extends World {
@@ -1051,7 +1051,7 @@ public class WorldServer extends World {
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();