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 61ba4cfbcbc576de5c1be2698d96cc20495b23f3 Mon Sep 17 00:00:00 2001
From 1e9e1b0a650d5d777278516091495530cd0b0a7d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 4 Apr 2020 02:36:45 -0500
Subject: [PATCH] Add more timings timers
@@ -12,7 +12,7 @@ Subject: [PATCH] Add more timings timers
5 files changed, 56 insertions(+)
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
index 434833d50..cb27ed36e 100644
index 37341d2d2..918eaf0c6 100644
--- a/src/main/java/co/aikar/timings/MinecraftTimings.java
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
@@ -43,6 +43,28 @@ public final class MinecraftTimings {
@@ -206,10 +206,10 @@ index 90319909e..ab51ef429 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index e1387ddce..4e513c3b8 100644
index 43535c38a..7298b41ca 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -833,7 +833,9 @@ public class WorldServer extends World {
@@ -842,7 +842,9 @@ public class WorldServer extends World {
return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString();
});
gameprofilerfiller.c("tickPassenger");