Updated Upstream (Paper & Tuinity)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
372dc10f Updated Upstream (CraftBukkit) (#4760)
d6fb9717 Updated Upstream (CraftBukkit)

Tuinity Changes:
2194b64 Optimizations (starlight, aka leaflight)
1a412ae Fix worldborder crash
957a2ef Fix chunk object leak
bcfe550 Re-Add unload poi data patch
This commit is contained in:
BillyGalbreath
2020-11-14 06:55:31 -06:00
parent f513a2f49b
commit 21e0b98494
23 changed files with 5714 additions and 625 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Entities can use portals configuration
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 4f16bfc7d..f65bb0276 100644
index ec755b0f2..14d6d2ef0 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2419,7 +2419,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2408,7 +2408,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void d(BlockPosition blockposition) {
if (this.ai()) {
this.resetPortalCooldown();
@@ -17,7 +17,7 @@ index 4f16bfc7d..f65bb0276 100644
if (!this.world.isClientSide && !blockposition.equals(this.ac)) {
this.ac = blockposition.immutableCopy();
}
@@ -2992,7 +2992,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2981,7 +2981,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean canPortal() {