Updated Upstream (Tuinity)

Upstream has released updates that appears to apply and compile correctly

Tuinity Changes:
ed9c0c4 Fix worldborder checks for getCubes
This commit is contained in:
BillyGalbreath
2020-11-22 07:21:18 -06:00
parent 3e0a7585a4
commit 058399c195
10 changed files with 95 additions and 67 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 ec755b0f2..14d6d2ef0 100644
index e80099249..33b43bb98 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2408,7 +2408,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2411,7 +2411,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void d(BlockPosition blockposition) {
if (this.ai()) {
this.resetPortalCooldown();
@@ -17,7 +17,7 @@ index ec755b0f2..14d6d2ef0 100644
if (!this.world.isClientSide && !blockposition.equals(this.ac)) {
this.ac = blockposition.immutableCopy();
}
@@ -2981,7 +2981,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2984,7 +2984,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean canPortal() {