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 e0eb783eee593cb57e849a4172c487bb1139bf03 Mon Sep 17 00:00:00 2001
From 2b8669bfb0b78ce0cd452493fa5a1692735352e2 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 30bde05b8..b6715862e 100644
index 44a7f2f60..819054106 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1377,6 +1377,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1378,6 +1378,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return MathHelper.c(f * f + f1 * f1 + f2 * f2);
}
@@ -276,10 +276,10 @@ index 60f62f19c..fa9fc940a 100644
+ // Purpur end
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 6e165a164..da5fef091 100644
index ecafbaa6b..cdd2f3ba2 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -137,6 +137,7 @@ public class ActivationRange
@@ -143,6 +143,7 @@ public class ActivationRange
{
player.activatedTick = MinecraftServer.currentTick;