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 652c74660ca2847379061598db0d76f1778cedad Mon Sep 17 00:00:00 2001
From b8502fc595d496a47f136d6aa11e995572d43ce3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:16 -0500
Subject: [PATCH] Implement lagging threshold
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement lagging threshold
3 files changed, 12 insertions(+)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 334ebae14f..14d6f67c2b 100644
index e4b1eabd77..510da109b0 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -183,6 +183,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -28,7 +28,7 @@ index 334ebae14f..14d6f67c2b 100644
+ lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
tickSection = curTime;
}
// Spigot end
chunksTasksRan = 0; // Paper
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index e219312168..b608b1deb3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java