Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2a4aef3 Mark ChatRender#render as ApiStatus.Override
PaperMC/Paper@f5b9e07 Add GameEvent tags (#6439)
PaperMC/Paper@b173c3e Use access transformers for player profile API (#7468)
PaperMC/Paper@286bd1b 1.18 misc performance dev branch (#7368)
PaperMC/Paper@5bb4549 Fix entity armor not showing on death animation (#7355)

patches/server/0046-Disable-loot-drops-on-death-by-cramming.patch

@@ -5,18 +5,21 @@ Subject: [PATCH] Disable loot drops on death by cramming
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ea51a01e8c8da9c8275c74e3f1e7cf8ab458c687..726909f539a72bebacde7547d8dfabff0a2469e1 100644
+index 456341b5ed16e72927a9fb8cb452de6369ed112e..d3d3b37c50ce36e411d2ca3e1c35c5b77f8fb8a6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1717,10 +1717,12 @@ public abstract class LivingEntity extends Entity {
+@@ -1722,6 +1722,7 @@ public abstract class LivingEntity extends Entity {
  
          this.dropEquipment(); // CraftBukkit - from below
          if (this.shouldDropLoot() && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
 +            if (!(source == DamageSource.CRAMMING && level.purpurConfig.disableDropsOnCrammingDeath)) { // Purpur
              this.dropFromLootTable(source, flag);
-             this.clearEquipmentSlots = false; // Paper
+             // Paper start
+             final boolean prev = this.clearEquipmentSlots;
+@@ -1730,6 +1731,7 @@ public abstract class LivingEntity extends Entity {
+             // Paper end
              this.dropCustomDeathLoot(source, i, flag);
-             this.clearEquipmentSlots = true; // Paper
+             this.clearEquipmentSlots = prev; // Paper
 +            } // Purpur
          }
          // CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment