Updated Upstream (Paper) (#395)

Upstream has released updates that appear to apply and compile correctly

Paper Changes :
2db85c5 fix: origin world can be unknown while knowing location
903fa9a Enable chunk load for feature search by default
This commit is contained in:
Bierque Jason
2021-06-18 02:27:20 +02:00
committed by GitHub
parent 6a226a29d7
commit 53ac6a9963
23 changed files with 67 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/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 6d17a5f75e073acccabbad65b998b4eb9e8cf400..e2de4d53e90b30f46a477c995505ac9f48cac842 100644
index 618f8735fe16f0490a321c447536c2558fcb67e3..45995a49dc7d441e82c1fbd043bf6249c16843bb 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2555,7 +2555,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
@@ -2560,7 +2560,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
public void d(BlockPosition blockposition) {
if (this.ai()) {
this.resetPortalCooldown();
@@ -17,7 +17,7 @@ index 6d17a5f75e073acccabbad65b998b4eb9e8cf400..e2de4d53e90b30f46a477c995505ac9f
if (!this.world.isClientSide && !blockposition.equals(this.ac)) {
this.ac = blockposition.immutableCopy();
}
@@ -3136,7 +3136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
@@ -3141,7 +3141,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
}
public boolean canPortal() {