Update Upstream (Paper)

This commit is contained in:
William Blake Galbreath
2021-08-28 22:23:37 -05:00
parent 348846b9e1
commit 8fc79317c7
121 changed files with 51 additions and 70 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 ff1592b73dbcf45b6936fe36fe0c3bb17bff198f..1c74a0b488048a250b1c2af6974cb8a1e18d7cec 100644
index 213d13800d2d8680c2f981cd5850c5a73d0978b1..bb167f668bc0b1218327f6ad3bd6b2cbe023d976 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2728,7 +2728,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -2727,7 +2727,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
public void handleInsidePortal(BlockPos pos) {
if (this.isOnPortalCooldown()) {
this.setPortalCooldown();
@@ -17,7 +17,7 @@ index ff1592b73dbcf45b6936fe36fe0c3bb17bff198f..1c74a0b488048a250b1c2af6974cb8a1
if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
this.portalEntrancePos = pos.immutable();
}
@@ -3360,7 +3360,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -3359,7 +3359,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
}
public boolean canChangeDimensions() {