Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
68994c64 Add a config to turn off Optimized TickList #3145
d847d336 Improve blocking players from opening inventories while sleeping
ac4f6b50 Clean up Timings and Async Chunk Configs
fcf89e85 Improve mid tick chunk loading, Fix Oversleep, other improvements
ab36835c Improve random ticking behaviour - Fixes #3181
This commit is contained in:
William Blake Galbreath
2020-04-26 16:29:21 -05:00
parent 660afe73df
commit c0e748c0c1
12 changed files with 44 additions and 44 deletions

View File

@@ -1,4 +1,4 @@
From e1030e6d994303fd20f00b1729315ed0246d0985 Mon Sep 17 00:00:00 2001
From 4788da0f8b7426b22c442457a2259c85b151b02a 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
@@ -50,7 +50,7 @@ index 16ccabfd5..5ac3c4641 100644
super(EntityTypes.PLAYER, world);
this.bV = ItemStack.a;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 51933a490..a021c111c 100644
index ea5dc1c4e..a99eb77b0 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1622,8 +1622,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -206,10 +206,10 @@ index 3c37d032c..c1a4697ae 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 fe81529a9..9b8739485 100644
index fc3a41e35..c85639e48 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -393,7 +393,7 @@ public class WorldServer extends World {
@@ -405,7 +405,7 @@ public class WorldServer extends World {
}
if (this.everyoneSleeping && this.players.stream().noneMatch((entityplayer) -> {
@@ -218,7 +218,7 @@ index fe81529a9..9b8739485 100644
})) {
// CraftBukkit start
long l = this.worldData.getDayTime() + 24000L;
@@ -714,7 +714,7 @@ public class WorldServer extends World {
@@ -723,7 +723,7 @@ public class WorldServer extends World {
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();