Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
de5b093c Handle chunk unloading during block tick
be7b4063 performance: Improve Activation Range entity iteration
bacbd880 performance: Many Entity Activation Range Improvements
269394fe Update hidden-configs
This commit is contained in:
William Blake Galbreath
2020-03-30 19:31:24 -05:00
parent 93bb79d462
commit 27fb33e6dc
14 changed files with 179 additions and 186 deletions

View File

@@ -1,4 +1,4 @@
From b83378602c40947122087a3fbbb4cd3ed2b80790 Mon Sep 17 00:00:00 2001
From d1f04238a8f31d59b7ca1617200af06b47e23271 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 27 Feb 2020 21:42:19 -0600
Subject: [PATCH] Configurable void damage height
@@ -9,10 +9,10 @@ Subject: [PATCH] Configurable void damage height
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index e41b36ddcd..f9c0af5319 100644
index 2f1652005..0d47ca549 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -451,7 +451,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -452,7 +452,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
// Paper start
protected void performVoidDamage() {
@@ -22,7 +22,7 @@ index e41b36ddcd..f9c0af5319 100644
&& this.locY >= world.paperConfig.netherVoidTopDamageHeight)) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 24d9c699ac..08980a797b 100644
index 24d9c699a..08980a797 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -198,6 +198,7 @@ public class PurpurWorldConfig {