Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2e7bb166 Deprecate dyes custom tag in favour of vanilla tag (#13855)
PaperMC/Paper@6048c2d9 Fix LivingEntity#knockback ignored when its Player (#13842)
PaperMC/Paper@b80b6046 fix: Attack strength ticker cooldown incorrectly reset (#13856)
PaperMC/Paper@1835b046 Call AsyncPlayerPreLoginEvent/AsyncPlayerConnectionConfigureEvent on virtual threads (#13816)
PaperMC/Paper@afea65c2 Fix leash event for boats and elytra (#13697)
PaperMC/Paper@39bd1bac [ci/skip] Rebuild patches
PaperMC/Paper@11dbf110 Call BlockRedstoneEvent for more interactions (#12206)
PaperMC/Paper@b8b4a1c7 Update Player#getClientViewDistance (#13530)
PaperMC/Paper@b685281d [ci/skip] Mention documenting new config options in CONTRIBUTING.md (#13664)

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

@@ -155,7 +155,7 @@
          }
  
          // CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment
-@@ -3269,6 +_,7 @@
+@@ -3256,6 +_,7 @@
              float dmg = (float)(diff * 10.0 - 3.0);
              if (dmg > 0.0F) {
                  this.playSound(this.getFallDamageSound((int)dmg), 1.0F, 1.0F);
@@ -163,7 +163,7 @@
                  this.hurt(this.damageSources().flyIntoWall(), dmg);
              }
          }
-@@ -4748,6 +_,12 @@
+@@ -4740,6 +_,12 @@
              ? slot == EquipmentSlot.MAINHAND && this.canUseSlot(EquipmentSlot.MAINHAND)
              : slot == equippable.slot() && this.canUseSlot(equippable.slot()) && equippable.canBeEquippedBy(this.typeHolder());
      }