Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@f7a1344 Improve PortalEvents (#8679)
PaperMC/Paper@e498dda Add missing EntityChangeBlockEvent (#8696)
This commit is contained in:
BillyGalbreath
2022-12-18 15:46:43 -06:00
parent 07afb7204e
commit 278eebff54
8 changed files with 17 additions and 17 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 c79dc51d590da219db7a9147144bc802e3da8637..8c894892234246f3bf297807bea4c0f6581e0c8e 100644
index 6368f92466b0755b042b965af08777fe982389ed..02409b1f99a74bdfe8663c8f77f6ce50f7c57eb1 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2912,7 +2912,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -17,7 +17,7 @@ index c79dc51d590da219db7a9147144bc802e3da8637..8c894892234246f3bf297807bea4c0f6
if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
this.portalEntrancePos = pos.immutable();
}
@@ -3595,7 +3595,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3602,7 +3602,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean canChangeDimensions() {