Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
a4f066cc Fix method profiler inbalance introduced in a2a9ffe (#3132)
c65dcad3 Don't delay chunk unloads during entity ticking
bc17ce69 Delay unsafe actions until after entity ticking is done - Fixes #3114
5553e6b3 Disable Sync Events firing Async errors during shutdown
e12c51d9 Use better variable for isStopping() API
586ee2bb Remove patch for MC-111480, fixed in 1.14
09a94215 Remove streams from Mob AI System
bb5c294e Fix Disabling Asynchronous Chunks
089d8356 Implement Chunk Priority / Urgency System for World Gen
fce69af7 Use dedicated thread for main thread blocking chunk loads
588b62e4 Add tick times API and /mspt command (#3102)
11de41c7 Add API MinecraftServer#isStopping (#3129)
942ff3c2 My patches are under MIT (#3130)
This commit is contained in:
William Blake Galbreath
2020-04-12 03:45:54 -05:00
parent bf845ca9e4
commit 193c511fce
95 changed files with 275 additions and 665 deletions

View File

@@ -1,4 +1,4 @@
From 5f4953b02d1597baf03c2a5df53b63bd69e595a6 Mon Sep 17 00:00:00 2001
From 06bc2751ebfd115af5d64546bf8c007a25f4abee 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
@@ -18,10 +18,10 @@ Subject: [PATCH] Implement AFK API
11 files changed, 112 insertions(+), 25 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 313b74fb0f..cdb32e40ed 100644
index 4a24f38885..1454c2fa4d 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1385,6 +1385,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1386,6 +1386,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return MathHelper.c(f * f + f1 * f1 + f2 * f2);
}
@@ -206,10 +206,10 @@ index 895e34ed34..f92516069a 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 42798f6e00..efe9796c4a 100644
index 7d9e61a82d..b9309f1d2c 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -383,7 +383,7 @@ public class WorldServer extends World {
@@ -393,7 +393,7 @@ public class WorldServer extends World {
}
if (this.everyoneSleeping && this.players.stream().noneMatch((entityplayer) -> {
@@ -218,7 +218,7 @@ index 42798f6e00..efe9796c4a 100644
})) {
// CraftBukkit start
long l = this.worldData.getDayTime() + 24000L;
@@ -696,7 +696,7 @@ public class WorldServer extends World {
@@ -714,7 +714,7 @@ public class WorldServer extends World {
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();