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] Climbing should not bypass cramming gamerule
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 4763dca41..6a9318318 100644
index e0532f145..763625294 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1728,6 +1728,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1717,6 +1717,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean isCollidable() {
@@ -131,10 +131,10 @@ index 1c682a62b..f7b92078e 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 7902cc7f1..a761bfea4 100644
index 287a496ee..9159601da 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1776,8 +1776,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1944,8 +1944,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
@Override