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 6c262a836b9e397bba5943f9f130ecdf09a26063 Mon Sep 17 00:00:00 2001
From 25bbc9ac23524b9aa48af17f295ef5d60d90c834 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 11 Jan 2020 23:12:52 -0600
Subject: [PATCH] Add EntityPortalReadyEvent
@@ -86,7 +86,7 @@ index 09c7c1318..6880cdd7f 100644
break;
// CraftBukkit start - add the block to our list
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 944199404..ceba4f355 100644
index 3533dbcd5..b609808df 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -169,9 +169,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -102,7 +102,7 @@ index 944199404..ceba4f355 100644
private boolean invulnerable;
protected UUID uniqueID;
protected String am;
@@ -2283,6 +2283,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2285,6 +2285,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.world.getMethodProfiler().enter("portal");
this.ag = i;
this.portalCooldown = this.ba();