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

purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch

@@ -64,7 +64,7 @@
          this.generator = generator;
          this.world = new CraftWorld((ServerLevel) this, worldKey, biomeProvider, environment);
  
-@@ -1504,4 +_,14 @@
+@@ -1505,4 +_,14 @@
          return ret;
      }
      // Paper end - allow patching this logic

purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/Block.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/block/Block.java
 +++ b/net/minecraft/world/level/block/Block.java
-@@ -111,6 +_,10 @@
+@@ -112,6 +_,10 @@
      public static final int UPDATE_LIMIT = 512;
      protected final StateDefinition<Block, BlockState> stateDefinition;
      private BlockState defaultBlockState;
@@ -11,7 +11,7 @@
      // Paper start - Protect Bedrock and End Portal/Frames from being destroyed
      public final boolean isDestroyable() {
          return io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowPermanentBlockBreakExploits ||
-@@ -412,7 +_,7 @@
+@@ -413,7 +_,7 @@
              event.setExpToDrop(block.getExpDrop(state, serverLevel, pos, net.minecraft.world.item.ItemStack.EMPTY, true)); // Paper - Properly handle xp dropping
              event.callEvent();
              for (org.bukkit.inventory.ItemStack drop : event.getDrops()) {
@@ -20,7 +20,7 @@
              }
              state.spawnAfterBreak(serverLevel, pos, ItemStack.EMPTY, false); // Paper - Properly handle xp dropping
              block.popExperience(serverLevel, pos, event.getExpToDrop()); // Paper - Properly handle xp dropping
-@@ -430,7 +_,7 @@
+@@ -431,7 +_,7 @@
  
      public static void dropResources(final BlockState state, final LevelAccessor level, final BlockPos pos, final @Nullable BlockEntity blockEntity) {
          if (level instanceof ServerLevel serverLevel) {
@@ -29,7 +29,7 @@
              state.spawnAfterBreak(serverLevel, pos, ItemStack.EMPTY, true);
          }
      }
-@@ -451,11 +_,30 @@
+@@ -452,11 +_,30 @@
          , final boolean dropExperience // Paper - Properly handle xp dropping
      ) {
          if (level instanceof ServerLevel serverLevel) {
@@ -61,7 +61,7 @@
      public static void popResource(final Level level, final BlockPos pos, final ItemStack itemStack) {
          double halfHeight = EntityTypes.ITEM.getHeight() / 2.0;
          RandomSource random = level.getRandom();
-@@ -545,7 +_,15 @@
+@@ -546,7 +_,15 @@
      }
  
      public void setPlacedBy(final Level level, final BlockPos pos, final BlockState state, final @Nullable LivingEntity by, final ItemStack itemStack) {
@@ -78,7 +78,7 @@
  
      public boolean isPossibleToRespawnInThis(final BlockState state) {
          return !state.isSolid() && !state.liquid();
-@@ -556,7 +_,7 @@
+@@ -557,7 +_,7 @@
      }
  
      public void fallOn(final Level level, final BlockState state, final BlockPos pos, final Entity entity, final double fallDistance) {

purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BlockEntity.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/BlockEntity.java
-@@ -107,6 +_,10 @@
+@@ -106,6 +_,10 @@
          input.read("PublicBukkitValues", CompoundTag.CODEC)
              .ifPresent(this.persistentDataContainer::putAll);
          // Paper end - read persistent data container
@@ -11,10 +11,10 @@
      }
  
      public final void loadWithComponents(final ValueInput input) {
-@@ -119,6 +_,11 @@
-     }
- 
-     protected void saveAdditional(final ValueOutput output) {
+@@ -123,6 +_,11 @@
+             output.store("PublicBukkitValues", CompoundTag.CODEC, this.persistentDataContainer.toTagCompound());
+         }
+         // CraftBukkit end
 +        // Purpur start - Persistent BlockEntity Lore and DisplayName
 +        if (this.persistentLore != null) {
 +            output.store("Purpur.persistentLore", net.minecraft.world.item.component.ItemLore.CODEC, this.persistentLore);
@@ -23,7 +23,7 @@
      }
  
      public final CompoundTag saveWithFullMetadata(final HolderLookup.Provider registries) {
-@@ -395,4 +_,16 @@
+@@ -388,4 +_,16 @@
              return this.blockEntity.getNameForReporting() + "@" + this.blockEntity.getBlockPos();
          }
      }