Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
ab74bb45 Speed up processing of chunk loads and generation
f5dd491f Increase Light Queue Size
9ab69348 Don't load chunks when attempting to unload a chunk
38c62622 Improve Optimize Memory use logic to make iterator safer and fix bad plugins like P2
This commit is contained in:
William Blake Galbreath
2020-04-09 19:37:51 -05:00
parent a29baddb7d
commit 16e780dcdb
20 changed files with 68 additions and 70 deletions

View File

@@ -1,4 +1,4 @@
From eef7618cf7493834b52ae7986d84d84dbde318d6 Mon Sep 17 00:00:00 2001
From 6f706722898460ae8b2a24a3782e2353cb6509e7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 30 Jan 2020 00:41:24 -0600
Subject: [PATCH] Add tick times API
@@ -9,7 +9,7 @@ Subject: [PATCH] Add tick times API
2 files changed, 49 insertions(+)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f939f56d96..334ebae14f 100644
index 63cc289e44..e4b1eabd77 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -106,6 +106,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -24,7 +24,7 @@ index f939f56d96..334ebae14f 100644
@Nullable
private KeyPair I;
@Nullable
@@ -1160,6 +1165,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1175,6 +1180,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.methodProfiler.enter("tallying");
long l = this.f[this.ticks % 100] = SystemUtils.getMonotonicNanos() - i;
@@ -37,7 +37,7 @@ index f939f56d96..334ebae14f 100644
this.av = this.av * 0.8F + (float) l / 1000000.0F * 0.19999999F;
long i1 = SystemUtils.getMonotonicNanos();
@@ -2255,4 +2266,30 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -2270,4 +2281,30 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
return SERVER; // Paper
}
// CraftBukkit end