Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@9e873f50 Fix inconsistencies between offline/online spawn position getter (#11960)
PaperMC/Paper@fc0c3717 Fix handling of resultant crafting container from craftItemResult (#12307)
PaperMC/Paper@a7a76c8f Add methods for Armadillo (#12031)
PaperMC/Paper@a74400d9 Update adventure to 4.21.0 (#12499)
PaperMC/Paper@1e930763 Fix ipv6 loopback addresses being able to get connection throttled (#12155)
PaperMC/Paper@646b80ca Fix unnecessary map data saves (#12296)
PaperMC/Paper@e663f999 Add combat tracker API (#11853)
PaperMC/Paper@cd4fe5b7 [ci/skip] Drop non-applicable ATs (#12498)
PaperMC/Paper@5acfdd6a Fix save/load NaN Entity Motion (#12269)
PaperMC/Paper@2754d7c3 Add Throw EntityChangeBlockEvent for BrushableBlockEntity#brush (#12133)
PaperMC/Paper@567f63ae Parity for respawn events (#11792)

purpur-server/minecraft-patches/sources/net/minecraft/world/damagesource/CombatTracker.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/damagesource/CombatTracker.java
 +++ b/net/minecraft/world/damagesource/CombatTracker.java
-@@ -55,7 +_,7 @@
+@@ -62,7 +_,7 @@
  
      private Component getMessageForAssistedFall(Entity entity, Component entityDisplayName, String hasWeaponTranslationKey, String noWeaponTranslationKey) {
          ItemStack itemStack = entity instanceof LivingEntity livingEntity ? livingEntity.getMainHandItem() : ItemStack.EMPTY;
@@ -9,7 +9,7 @@
              ? Component.translatable(hasWeaponTranslationKey, this.mob.getDisplayName(), entityDisplayName, itemStack.getDisplayName())
              : Component.translatable(noWeaponTranslationKey, this.mob.getDisplayName(), entityDisplayName);
      }
-@@ -99,6 +_,15 @@
+@@ -106,6 +_,15 @@
                  Component component = ComponentUtils.wrapInSquareBrackets(Component.translatable(string + ".link")).withStyle(INTENTIONAL_GAME_DESIGN_STYLE);
                  return Component.translatable(string + ".message", this.mob.getDisplayName(), component);
              } else {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch

@@ -86,7 +86,7 @@
          if (this.getVehicle() instanceof AbstractBoat abstractBoat && !abstractBoat.isUnderWater()) {
              this.wasTouchingWater = false;
          } else if (this.updateFluidHeightAndDoFluidPushing(FluidTags.WATER, 0.014)) {
-@@ -2512,6 +_,13 @@
+@@ -2513,6 +_,13 @@
                  compound.putBoolean("Paper.FreezeLock", true);
              }
              // Paper end
@@ -100,7 +100,7 @@
              return compound;
          } catch (Throwable var8) {
              CrashReport crashReport = CrashReport.forThrowable(var8, "Saving entity NBT");
-@@ -2629,6 +_,13 @@
+@@ -2630,6 +_,13 @@
                  freezeLocked = compound.getBooleanOr("Paper.FreezeLock", false);
              }
              // Paper end
@@ -114,7 +114,7 @@
          } catch (Throwable var8) {
              CrashReport crashReport = CrashReport.forThrowable(var8, "Loading entity NBT");
              CrashReportCategory crashReportCategory = crashReport.addCategory("Entity being loaded");
-@@ -2857,6 +_,7 @@
+@@ -2858,6 +_,7 @@
          if (this.isAlive() && this instanceof Leashable leashable) {
              if (leashable.getLeashHolder() == player) {
                  if (!this.level().isClientSide()) {
@@ -122,7 +122,7 @@
                      // CraftBukkit start - fire PlayerUnleashEntityEvent
                      // Paper start - Expand EntityUnleashEvent
                      org.bukkit.event.player.PlayerUnleashEntityEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerUnleashEntityEvent(this, player, hand, !player.hasInfiniteMaterials());
-@@ -3173,15 +_,18 @@
+@@ -3174,15 +_,18 @@
          return Vec3.directionFromRotation(this.getRotationVector());
      }
  
@@ -142,7 +142,7 @@
              }
          }
      }
-@@ -3386,7 +_,7 @@
+@@ -3387,7 +_,7 @@
      }
  
      public int getMaxAirSupply() {
@@ -151,7 +151,7 @@
      }
  
      public int getAirSupply() {
-@@ -3914,7 +_,7 @@
+@@ -3915,7 +_,7 @@
      // CraftBukkit end
  
      public boolean canUsePortal(boolean allowPassengers) {
@@ -160,7 +160,7 @@
      }
  
      public boolean canTeleport(Level fromLevel, Level toLevel) {
-@@ -4451,6 +_,12 @@
+@@ -4452,6 +_,12 @@
          return Mth.lerp(partialTick, this.yRotO, this.yRot);
      }
  
@@ -173,7 +173,7 @@
      // Paper start - optimise collisions
      public boolean updateFluidHeightAndDoFluidPushing(final TagKey<Fluid> fluid, final double flowScale) {
          if (this.touchingUnloadedChunk()) {
-@@ -4859,7 +_,7 @@
+@@ -4860,7 +_,7 @@
      }
  
      public float maxUpStep() {