Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a7ae966 readd itemstack data sanitization (#10454)
PaperMC/Paper@ca50b87 Clear firework item properly (#10793)
PaperMC/Paper@9774a52 fix and cleanup loot table patches (#10100)
PaperMC/Paper@ac4ee06 Fix integer overflow for lag compensating eating check (#10797)
PaperMC/Paper@6649a17 Fix BlockStateMeta equals (#10795)
PaperMC/Paper@1b8cdc6 Extend Player Interact cancellation to cover Jigsaw blocks (#10719)
PaperMC/Paper@841ab41 Fix more item desync when an event is cancelled (#10654)
PaperMC/Paper@b0e3ca4 Prevent NPE if hooked entity was cleared (#10712)
PaperMC/Paper@347bbe3 Fix Cancelling BlockPlaceEvent calling onRemove (#10773)
This commit is contained in:
granny
2024-05-26 17:12:40 -07:00
parent 22fc5f9bda
commit 2842b97ddf
38 changed files with 160 additions and 160 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 8ab25832250e68ce1838dbe13394b44a0ed2ca9c..e61e4413e05bf8ec699044d26abf355ddad636eb 100644
index b3fe632b18e5dfa18d37ef23a5a62f3a0f9ccf42..e29f56c83e8ce237e9135fabcf2381130a1a790d 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3226,7 +3226,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3225,7 +3225,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
public void handleInsidePortal(BlockPos pos) {
if (this.isOnPortalCooldown()) {
this.setPortalCooldown();
@@ -17,7 +17,7 @@ index 8ab25832250e68ce1838dbe13394b44a0ed2ca9c..e61e4413e05bf8ec699044d26abf355d
if (!this.level().isClientSide && !pos.equals(this.portalEntrancePos)) {
this.portalEntrancePos = pos.immutable();
}
@@ -3920,7 +3920,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3919,7 +3919,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
public boolean canChangeDimensions() {