Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@cc0f25cb Apply more feature patches
PaperMC/Paper@e7b684ed fix
PaperMC/Paper@71ccae07 Revert "move block data/state impl"
PaperMC/Paper@7612b5d0 Add identifier comparator for Plugin tickets
PaperMC/Paper@35b466e3 Add support for getting data components from entities
PaperMC/Paper@9f50f858 patch
PaperMC/Paper@42623c4b no patch

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
-@@ -159,11 +_,55 @@
+@@ -160,11 +_,55 @@
      }
      // Paper end - add paper world config
  
@@ -56,7 +56,7 @@
      public CraftWorld getWorld() {
          return this.world;
      }
-@@ -839,6 +_,8 @@
+@@ -840,6 +_,8 @@
          // Paper end - getblock optimisations - cache world height/sections
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) levelData).getLevelName()); // Spigot
          this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
@@ -65,7 +65,7 @@
          this.generator = gen;
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
-@@ -2115,4 +_,14 @@
+@@ -2127,4 +_,14 @@
              return this.id;
          }
      }

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/NaturalSpawner.java
 +++ b/net/minecraft/world/level/NaturalSpawner.java
-@@ -206,7 +_,7 @@
+@@ -261,7 +_,7 @@
                      mutableBlockPos.set(x, y, z);
                      double d = x + 0.5;
                      double d1 = z + 0.5;

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
-@@ -104,6 +_,10 @@
+@@ -105,6 +_,10 @@
              this.persistentDataContainer.putAll((CompoundTag) persistentDataTag);
          }
          // Paper end - read persistent data container
@@ -11,7 +11,7 @@
      }
  
      public final void loadWithComponents(CompoundTag tag, HolderLookup.Provider registries) {
-@@ -117,6 +_,12 @@
+@@ -118,6 +_,12 @@
      }
  
      protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) {
@@ -24,7 +24,7 @@
      }
  
      public final CompoundTag saveWithFullMetadata(HolderLookup.Provider registries) {
-@@ -377,4 +_,17 @@
+@@ -379,4 +_,17 @@
          private ComponentHelper() {
          }
      }

purpur-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/EntityStorage.java.patch

@@ -1,8 +1,8 @@
 --- a/net/minecraft/world/level/chunk/storage/EntityStorage.java
 +++ b/net/minecraft/world/level/chunk/storage/EntityStorage.java
-@@ -89,6 +_,7 @@
-             ListTag listTag = new ListTag();
-             entities.getEntities().forEach(entity -> {
+@@ -100,6 +_,7 @@
+                 }
+                 // Paper end - Entity load/save limit per chunk
                  CompoundTag compoundTag1 = new CompoundTag();
 +                if (!entity.canSaveToDisk()) return; // Purpur - Add canSaveToDisk to Entity
                  if (entity.save(compoundTag1)) {

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -238,7 +_,7 @@
+@@ -283,7 +_,7 @@
  
      // Paper start
      private static void printOversizedLog(String msg, Path file, int x, int z) {