Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@cdad49b7 Do not mark plugin tickets as forced; keep correct ticket types
PaperMC/Paper@a1c4fc96 Add generic ticket identifier
PaperMC/Paper@745881bb Update Moonrise common for 1.21.5
PaperMC/Paper@e9d00eb6 Apply Moonrise patch
PaperMC/Paper@ef0f0d10 Copy Moonrise 1.21.5 update over

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/EntityGetter.java
 +++ b/net/minecraft/world/level/EntityGetter.java
-@@ -144,7 +_,7 @@
+@@ -185,7 +_,7 @@
  
      default boolean hasNearbyAlivePlayer(double x, double y, double z, double distance) {
          for (Player player : this.players()) {

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
-@@ -158,11 +_,55 @@
+@@ -159,11 +_,55 @@
      }
      // Paper end - add paper world config
  
@@ -56,8 +56,8 @@
      public CraftWorld getWorld() {
          return this.world;
      }
-@@ -206,6 +_,8 @@
-     ) {
+@@ -839,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
 +        this.purpurConfig = new org.purpurmc.purpur.PurpurWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) levelData).getLevelName(), env); // Purpur - Purpur config files
@@ -65,7 +65,7 @@
          this.generator = gen;
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
-@@ -1412,4 +_,14 @@
+@@ -2115,4 +_,14 @@
              return this.id;
          }
      }

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/ServerExplosion.java
 +++ b/net/minecraft/world/level/ServerExplosion.java
-@@ -73,7 +_,7 @@
+@@ -316,7 +_,7 @@
      ) {
          this.level = level;
          this.source = source;
@@ -9,7 +9,7 @@
          this.center = center;
          this.fire = fire;
          this.blockInteraction = blockInteraction;
-@@ -356,10 +_,27 @@
+@@ -638,10 +_,27 @@
  
      public void explode() {
          // CraftBukkit start
@@ -35,6 +35,6 @@
 +            }
 +        }
 +        // Purpur end - Add PreExplodeEvents
-         this.level.gameEvent(this.source, GameEvent.EXPLODE, this.center);
-         List<BlockPos> list = this.calculateExplodedPositions();
-         this.hurtEntities();
+         // Paper start - collision optimisations
+         this.blockCache = new it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap<>();
+         this.chunkPosCache = new long[CHUNK_CACHE_WIDTH * CHUNK_CACHE_WIDTH];

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
-@@ -49,7 +_,7 @@
+@@ -238,7 +_,7 @@
  
      // Paper start
      private static void printOversizedLog(String msg, Path file, int x, int z) {

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/material/FlowingFluid.java
 +++ b/net/minecraft/world/level/material/FlowingFluid.java
-@@ -190,7 +_,7 @@
+@@ -232,7 +_,7 @@
              }
          }
  
@@ -9,7 +9,7 @@
              BlockState blockState1 = level.getBlockState(mutableBlockPos.setWithOffset(pos, Direction.DOWN));
              FluidState fluidState1 = blockState1.getFluidState();
              if (blockState1.isSolid() || this.isSourceBlockOfThisType(fluidState1)) {
-@@ -267,6 +_,12 @@
+@@ -319,6 +_,12 @@
      }
  
      protected abstract boolean canConvertToSource(ServerLevel level);