Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e2c7e5cf Limit projectiles size
PaperMC/Paper@ca5e948a Fix override of new item for Firework entity (#13891)
PaperMC/Paper@20938c72 Set Obsolete the use of PotionMeta in Potion entities (#13892)
PaperMC/Paper@76d2ac75 [ci/skip] Fix AreaEffectCloud doc comments (#13926)
PaperMC/Paper@f414ba89 run generator
PaperMC/Paper@9194ea20 fix duplicate goal name for cube mobs
PaperMC/Paper@b0c2992a Fix "-1 releases behind" being logged for early snapshots
PaperMC/Paper@46a24d6a Merge remote-tracking branch 'origin/main' into dev/26.2
PaperMC/Paper@2c0dfb53 Fix emptying sulfur cube bucket doesn't work
PaperMC/Paper@b1b09191 update todo
PaperMC/Paper@f23495f0 Commodore rewriting for breaking slime API change
PaperMC/Paper@9a1623b3 fix tests
PaperMC/Paper@611a0ab5 Update to 26.2-pre-4
PaperMC/Paper@87cc35db delegate more stuff to CraftItemStack
PaperMC/Paper@8ea9659a bump built-in pack and regenerate tags
PaperMC/Paper@46cc8588 fix dispense events a bit
PaperMC/Paper@5c5ff5c8 remove redundant bed updates
PaperMC/Paper@1b087229 Unapply hopper patch
PaperMC/Paper@c600b162 skip POI cleanup when place event is cancelled for now
This commit is contained in:
granny
2026-06-04 18:51:54 -07:00
parent b5808d9dfe
commit a857d511b9
19 changed files with 40 additions and 40 deletions

View File

@@ -3,7 +3,7 @@
@@ -452,6 +_,7 @@
// revert back all captured blocks
for (org.bukkit.block.BlockState blockstate : blocks) {
((org.bukkit.craftbukkit.block.CraftBlockState) blockstate).revertPlace();
((org.bukkit.craftbukkit.block.CraftBlockState) blockstate).revertPlace(true); // poi updates needs to be skipped since the poi were never registered as part of the capture
+ ((org.bukkit.craftbukkit.block.CraftBlock) blockstate.getBlock()).getBlockState().getBlock().forgetPlacer(); // Purpur - Store placer on Block when placed
}
@@ -16,7 +16,7 @@
level.notifyAndUpdatePhysics(newPos, null, oldBlock, block, level.getBlockState(newPos), updateFlags, net.minecraft.world.level.block.Block.UPDATE_LIMIT); // send null chunk as chunk.k() returns false by this point
}
@@ -590,6 +_,26 @@
@@ -579,6 +_,26 @@
return this.isDamageableItem() && this.getDamageValue() > 0;
}
@@ -43,7 +43,7 @@
public int getDamageValue() {
return Mth.clamp(this.getOrDefault(DataComponents.DAMAGE, 0), 0, this.getMaxDamage());
}
@@ -1254,6 +_,12 @@
@@ -1237,6 +_,12 @@
public boolean isEnchanted() {
return !this.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY).isEmpty();
}