Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@b14979e Remove isRemoved skip on .discard() (#9520)
PaperMC/Paper@1837f6c Prevent entity removals if the entity slices is receiving status updates
PaperMC/Paper@a40e48f Add cause to PlayerOpenSignEvent (#9441)
This commit is contained in:
granny
2023-07-26 12:43:35 -07:00
parent 7cefa0cafa
commit 9dab7fe5f1
14 changed files with 47 additions and 47 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 36b375a67b1bc9baa4f3cef8e63bd9f6448f1335..7884f5ef86fc560349689ae5f034799f50ad811b 100644
index ed34b0d7ee6263821412f4ffa5e85ee05922a936..c565d863808a9facd561fb9704c2a9ce4ba2d5e2 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3062,7 +3062,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3061,7 +3061,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public void handleInsidePortal(BlockPos pos) {
if (this.isOnPortalCooldown()) {
this.setPortalCooldown();
@@ -17,7 +17,7 @@ index 36b375a67b1bc9baa4f3cef8e63bd9f6448f1335..7884f5ef86fc560349689ae5f034799f
if (!this.level().isClientSide && !pos.equals(this.portalEntrancePos)) {
this.portalEntrancePos = pos.immutable();
}
@@ -3758,7 +3758,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3757,7 +3757,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean canChangeDimensions() {