Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@408a905 Don't put entities removed during the portal exit event into an invalid state
This commit is contained in:
granny
2023-08-08 03:43:36 -07:00
parent 98f10775ac
commit 41ab912b5b
7 changed files with 19 additions and 19 deletions

View File

@@ -5,7 +5,7 @@ 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 ed34b0d7ee6263821412f4ffa5e85ee05922a936..c565d863808a9facd561fb9704c2a9ce4ba2d5e2 100644
index 5420075f774e2327d17ecbf6fd1afba0b96ff1f4..9be349874c40722f05ad5b81e62dcd0098acc7c4 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3061,7 +3061,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -17,7 +17,7 @@ index ed34b0d7ee6263821412f4ffa5e85ee05922a936..c565d863808a9facd561fb9704c2a9ce
if (!this.level().isClientSide && !pos.equals(this.portalEntrancePos)) {
this.portalEntrancePos = pos.immutable();
}
@@ -3757,7 +3757,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3762,7 +3762,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean canChangeDimensions() {