Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
b1691e7b Remove some Streams usage in Entity Collision
d454bbd5 Implement JellySquid's Entity Collision optimisations patch
8e85f841 Optimize Collision to not load chunks
ceb824db Fix ChunkCache .getXIfLoaded to use the local chunks in the cache
This commit is contained in:
William Blake Galbreath
2020-05-09 19:58:46 -05:00
parent 833bd1cc47
commit 9c87f5730d
13 changed files with 135 additions and 135 deletions

View File

@@ -1,4 +1,4 @@
From 3a361398ad21e98a81237dd15cff86cd3aa94201 Mon Sep 17 00:00:00 2001
From d1cf022928b0c3dee8838a58215fc5cfef8fb2c2 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, 111 insertions(+), 25 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index b64e287db..944199404 100644
index e54d8f595..3533dbcd5 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1435,6 +1435,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1436,6 +1436,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return MathHelper.c(f * f + f1 * f1 + f2 * f2);
}
@@ -106,10 +106,10 @@ index f3278d356..219a274f9 100644
return this.serverStatisticManager;
}
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index 899619009..d9f246b87 100644
index e0d97d2c8..e1a7926d7 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -125,28 +125,18 @@ public interface IEntityAccess {
@@ -150,28 +150,18 @@ public interface IEntityAccess {
return entityhuman;
}