Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@f40a3f67 Update README version badge for 26.2 [ci/skip] (#13953)
PaperMC/Paper@c04c71b2 fix folia entity scheduler
PaperMC/Paper@fe1b210d don't break Vex#getSummoner
PaperMC/Paper@d16f5ccc Use more accurate placed sound for block item
PaperMC/Paper@03b30e07 Reset updatingMinecraft

gradle.properties

@@ -3,7 +3,7 @@ group = org.purpurmc.purpur
 mcVersion = 26.2-rc-2
 apiVersion = 26.2
 channel=EXPERIMENTAL
-paperCommit = d1aca9a6c1057bd291255d3e2252dbf04992e410
+paperCommit = 03b30e077aee14c7fb639583cab46a446ef69d73
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true

purpur-server/build.gradle.kts.patch

@@ -27,7 +27,7 @@
 +    // Purpur end - Rebrand
 +
 +    /*updatingMinecraft { // Purpur start - TODO - snapshot - we don't need this
-         oldPaperCommit = "d4fe85375af18bfa88f44d7c1e6a61904ae550cc"
+         // oldPaperCommit = "d4fe85375af18bfa88f44d7c1e6a61904ae550cc"
 -    }
 +    }*/ // Purpur end - TODO - snapshot - we don't need this
  }

purpur-server/minecraft-patches/features/0008-Implement-elytra-settings.patch

@@ -49,10 +49,10 @@ index b3443ff2d06af328493046e723efc11d299a2824..3c001b3810097d5cb60ad64e0727d8d9
                          itemStack.shrink(1); // Moved up from below
                      } else {
 diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java
-index 3bbad55a7a81534a192e91ecd198f3201f65f527..d74eef5eb06f7d957941e9602f137f20c25fc3c5 100644
+index 92d4a8ea07e96f84df655c63e21716549f52d8b9..abaa39135d3025a4ef066428d46af814a4854de4 100644
 --- a/net/minecraft/world/item/ItemStack.java
 +++ b/net/minecraft/world/item/ItemStack.java
-@@ -669,6 +669,14 @@ public final class ItemStack implements DataComponentHolder, ItemInstance {
+@@ -666,6 +666,14 @@ public final class ItemStack implements DataComponentHolder, ItemInstance {
                  org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent(serverPlayer, this); // Paper - Add EntityDamageItemEvent
              }
              // CraftBukkit end

purpur-server/minecraft-patches/rejected/net/minecraft/world/level/chunk/storage/RegionFileStorage.java.patch

@@ -1,19 +0,0 @@
-From d44c75e006d2ffe1b3217d503036c0a070fc63ba Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 06:37:42 -0700
-Subject: [PATCH] purpur File Patches
-
-
-diff --git a/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index e47a91b1869801258d0db20c126722fb06522c80..76174967cc80e8b7024b4d8cf48289c5e14bc6f2 100644
---- a/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-+++ b/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -309,7 +309,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
- 
-     // Paper start
-     private static void printOversizedLog(String msg, Path file, int x, int z) {
--        LOGGER.error("{} ({} - {},{}) Go clean it up to remove this message. /minecraft:tp {} 128 {} - DO NOT REPORT THIS TO PAPER - You may ask for help on Discord, but do not file an issue. These error messages can not be removed.", msg, file.toString().replaceAll(".+[\\\\/]", ""), x, z, x << 4, z << 4);
-+        LOGGER.error("{} ({} - {},{}) Go clean it up to remove this message. /minecraft:tp {} 128 {} - DO NOT REPORT THIS TO PURPUR - You may ask for help on Discord, but do not file an issue. These error messages can not be removed.", msg, file.toString().replaceAll(".+[\\\\/]", ""), x, z, x << 4, z << 4); // Purpur - Rebrand
-     }
- 
-     private static CompoundTag readOversizedChunk(RegionFile regionfile, ChunkPos chunkCoordinate) throws IOException {

purpur-server/minecraft-patches/sources/net/minecraft/world/item/ItemStack.java.patch

@@ -8,15 +8,15 @@
                  }
              } else {
                  // Change the stack to its new contents if it hasn't been tampered with.
-@@ -477,6 +_,7 @@
+@@ -476,6 +_,7 @@
                      if (!(block.getBlock() instanceof net.minecraft.world.level.block.BaseEntityBlock)) { // Containers get placed automatically
                          block.onPlace(level, newPos, oldBlock, true, context);
                      }
 +                    block.getBlock().forgetPlacer(); // Purpur - Store placer on Block when placed
  
-                     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
+                     level.notifyAndUpdatePhysics(newPos, null, oldBlock, block, level.getBlockState(newPos), snapshot.getFlags(), net.minecraft.world.level.block.Block.UPDATE_LIMIT); // send null chunk as chunk.k() returns false by this point
                  }
-@@ -566,6 +_,26 @@
+@@ -563,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());
      }
-@@ -1230,6 +_,12 @@
+@@ -1227,6 +_,12 @@
      public boolean isEnchanted() {
          return !this.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY).isEmpty();
      }