Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@7ee1cc11 Add ignite and fuse API for SulfurCube (#13944)
PaperMC/Paper@77202ea9 move a bunch of stuff out of unsafe
PaperMC/Paper@000cf99e finish migration to api bridge
PaperMC/Paper@8e5d42fa fix NPE in PaperComponents.resolveWithContext
PaperMC/Paper@f45bc608 fix infinite loop for any explosion hitting bedrock
PaperMC/Paper@6631e645 set dead flag again for dragon

gradle.properties

@@ -3,7 +3,7 @@ group = org.purpurmc.purpur
 mcVersion = 26.2-pre-5
 apiVersion = 26.2
 channel=EXPERIMENTAL
-paperCommit = 620da256d6de496a26b788fc394c241fb9cd61c1
+paperCommit = 6631e645f66503e1ff90b71d0288156063a7056b
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true

purpur-api/paper-patches/files/src/main/java/org/bukkit/command/defaults/VersionCommand.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -214,7 +_,7 @@
+@@ -215,7 +_,7 @@
          String version = Bukkit.getVersion();
          // Paper start
          if (version.startsWith("null")) { // running from ide?
@@ -9,7 +9,7 @@
              return;
          }
          setVersionMessage(getVersionFetcher().getVersionMessage(version));
-@@ -255,9 +_,11 @@
+@@ -256,9 +_,11 @@
      // Paper start
      private void setVersionMessage(final @NotNull Component msg) {
          lastCheck = System.currentTimeMillis();

purpur-api/paper-patches/files/src/main/java/org/bukkit/inventory/ItemStack.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -24,6 +_,13 @@
+@@ -23,6 +_,13 @@
  import org.bukkit.persistence.PersistentDataContainer;
  import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
@@ -14,7 +14,7 @@
  
  /**
   * Represents a stack of items.
-@@ -1372,4 +_,482 @@
+@@ -1374,4 +_,482 @@
          return this.craftDelegate.matchesWithoutData(item, excludeTypes, ignoreCount);
      }
      // Paper end - data component API

purpur-server/minecraft-patches/features/0002-Configurable-entity-base-attributes.patch

@@ -974,7 +974,7 @@ index f54a14a1e434cbfedf709d3b1495f2ae9ae4f11f..acf623ba0ab1f1d6c98af1a83cddd634
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
 diff --git a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index c0ffda7c18461494aee68aac2d99a660e3b21dcf..ffd612896a30ebff55906baba94150eb25fd8e98 100644
+index 57d415d987924c2b9025f8137baae20e99fd55ca..0efd061a3f53eaa657113579d8833f488e4d7bc4 100644
 --- a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -165,6 +165,13 @@ public class EnderDragon extends Mob implements Enemy {
@@ -991,7 +991,7 @@ index c0ffda7c18461494aee68aac2d99a660e3b21dcf..ffd612896a30ebff55906baba94150eb
      public static AttributeSupplier.Builder createAttributes() {
          return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0).add(Attributes.CAMERA_DISTANCE, 16.0);
      }
-@@ -1068,7 +1075,7 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -1069,7 +1076,7 @@ public class EnderDragon extends Mob implements Enemy {
  
      @Override
      protected float sanitizeScale(final float scale) {
@@ -1501,7 +1501,7 @@ index 0ac7a442a0ea79f190aceb60b771d616b377e613..22c20e4360473cdbe9cda8bb7b3b30be
 +    }
  }
 diff --git a/net/minecraft/world/entity/monster/cubemob/SulfurCube.java b/net/minecraft/world/entity/monster/cubemob/SulfurCube.java
-index 7b3ab0515bae1963cdd2319f097bfffb4d12f4e5..a966d253af27d5a8cc89a2454cf60377bdf7ce62 100644
+index 67658b7493593b70939b891b064f817433e70d42..d5591ac5853e9f016e385bfa852a64bf40fb0dce 100644
 --- a/net/minecraft/world/entity/monster/cubemob/SulfurCube.java
 +++ b/net/minecraft/world/entity/monster/cubemob/SulfurCube.java
 @@ -151,6 +151,20 @@ public class SulfurCube extends AbstractCubeMob implements Bucketable, Shearable

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-@@ -967,6 +_,7 @@
+@@ -968,6 +_,7 @@
  
      @Override
      protected boolean canRide(final Entity vehicle) {
@@ -8,7 +8,7 @@
          return false;
      }
  
-@@ -1002,7 +_,7 @@
+@@ -1003,7 +_,7 @@
          boolean shouldDrop = level.getGameRules().get(GameRules.MOB_DROPS);
          int xpCount = 500;
  

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
-@@ -342,6 +_,23 @@
+@@ -341,6 +_,23 @@
      }
  
      public int explode() {

purpur-server/paper-patches/features/0004-API-for-any-mob-to-burn-daylight.patch

@@ -24,10 +24,10 @@ index 612e3457d537d6129437443753cad3e48590d542..a188eb750d6371f7e550a8971135a81d
          Preconditions.checkArgument(entity != null, "Unknown entity");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 86ea370201a3c92f70289ca197adcb69130b53cb..b7b82bf44c164123dd62a690421001b110b68af8 100644
+index 77fc83bfe613d0e795d8623584bc79ee51d46b59..489aa599f979433ec2ae8c9a77aa9c2b0c6f0662 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1141,4 +1141,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1137,4 +1137,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          manager.untrackWaypoint(getHandle());
          manager.trackWaypoint(getHandle());
      }

purpur-server/paper-patches/files/src/main/java/io/papermc/paper/PaperServerInternalAPIBridge.java.patch

@@ -0,0 +1,11 @@
+--- a/src/main/java/io/papermc/paper/PaperServerInternalAPIBridge.java
++++ b/src/main/java/io/papermc/paper/PaperServerInternalAPIBridge.java
+@@ -181,7 +_,7 @@
+ 
+     @Override
+     public VersionFetcher getVersionFetcher() {
+-        return new PaperVersionFetcher();
++        return new org.purpurmc.purpur.PurpurVersionFetcher(); // Purpur - use old Paper version checker
+     }
+ 
+     @Override

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -499,7 +_,7 @@
+@@ -495,7 +_,7 @@
          net.minecraft.server.level.ServerPlayer nmsKiller = killer == null ? null : ((CraftPlayer) killer).getHandle();
          this.getHandle().setLastHurtByMob(nmsKiller);
          if (nmsKiller != null) {

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -782,4 +_,285 @@
+@@ -791,4 +_,285 @@
      }
  
      // Paper end - data component API

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch

@@ -1,11 +0,0 @@
---- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -486,7 +_,7 @@
- 
-     @Override
-     public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
--        return new com.destroystokyo.paper.PaperVersionFetcher();
-+        return new org.purpurmc.purpur.PurpurVersionFetcher(); // Purpur - use old Paper version checker
-     }
- 
-     @Override