Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@6cfa2f7 [ci skip] Add missing nullability annotation to sendEquipmentChange method (#12112)
PaperMC/Paper@9b9de82 Update Alternate Current patch to v1.9.1 (#12115)
PaperMC/Paper@c62252e Add lore content guard (#12116)
PaperMC/Paper@4041678 [ci-skip] Mention missing World#regenerateChunk implementation in jd (#12109)
PaperMC/Paper@a6e82d9 [ci skip] Clarify getChunkAtAsyncUrgently javadocs (#12125)
PaperMC/Paper@cb25c0c [ci skip] Fix annotation fields used in NMS getBukkitEntity (#12120)
PaperMC/Paper@0070126 [ci skip] improvement example in javadoc for DatapackRegistrar (#12122)
PaperMC/Paper@608f004 add method on ItemStack to edit pdc (#12022)
PaperMC/Paper@7bee997 Cleanup damage source a bit (#12106)
PaperMC/Paper@b9023b5 Add EntityAttemptSmashAttackEvent (#12113)
PaperMC/Paper@a3781ff Separate tick count to ensure vanilla parity (#12077)
PaperMC/Paper@2a4a115 Add EntityEquipmentChangedEvent (#12011)
PaperMC/Paper@06f96dd Improvement in /plugins command (#12121)
PaperMC/Paper@28d07dc use correct spigot plugin count
PaperMC/Paper@60394c5 Fix PlayerReadyArrowEvent cancellation desync (#12111)
PaperMC/Paper@b27e11c Fix bad world to chunk coordinate example in javadocs (#12131)
PaperMC/Paper@88cdd22 Fixup luck and random implementation in CB loot-tables (#11926)
PaperMC/Paper@84609dc Don't auto-create any brig redirects (#11954)
PaperMC/Paper@8eb8e44 Allow For Default Titles in InventoryView Builders (#12013)

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -521,6 +_,7 @@
+@@ -522,6 +_,7 @@
          }
      }
      // Paper end - optimise entity tracker
@@ -8,7 +8,7 @@
  
      public Entity(EntityType<?> entityType, Level level) {
          this.type = entityType;
-@@ -4021,7 +_,7 @@
+@@ -4022,7 +_,7 @@
      }
  
      public boolean isPushedByFluid() {

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

@@ -151,7 +151,7 @@
                  this.hurtArmor(damageSource, armorDamage);
              }
  
-@@ -3269,6 +_,11 @@
+@@ -3285,6 +_,11 @@
                      if (this.level() instanceof ServerLevel serverLevel) {
                          EnchantmentHelper.runLocationChangedEffects(serverLevel, itemBySlot, this, equipmentSlot1);
                      }
@@ -162,8 +162,8 @@
 +                    // Sakura end - legacy combat mechanics
                  }
              }
-         }
-@@ -3492,7 +_,7 @@
+ 
+@@ -3510,7 +_,7 @@
              }
          }
          // Paper end - Add EntityMoveEvent
@@ -172,7 +172,7 @@
              this.hurtServer(serverLevel, this.damageSources().drown(), 1.0F);
          }
      }
-@@ -4047,8 +_,16 @@
+@@ -4065,8 +_,16 @@
      }
  
      public boolean isBlocking() {

sakura-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch

@@ -57,7 +57,7 @@
 +                            && (this.level().sakuraConfig().players.combat.legacyCombatMechanics || !this.isSprinting()); // Sakura - legacy combat mechanics
                          flag2 = flag2 && !this.level().paperConfig().entities.behavior.disablePlayerCrits; // Paper - Toggleable player crits
                          if (flag2) {
-                             damageSource = damageSource.critical(true); // Paper start - critical damage API
+                             damageSource = damageSource.critical(); // Paper - critical damage API
 @@ -1292,7 +_,21 @@
                          if (flag4) {
                              float f4 = this.getKnockback(target, damageSource) + (flag1 ? 1.0F : 0.0F);
@@ -90,7 +90,7 @@
                                  float f5 = 1.0F + (float)this.getAttributeValue(Attributes.SWEEPING_DAMAGE_RATIO) * f;
  
                                  for (LivingEntity livingEntity2 : this.level()
-@@ -1331,7 +_,7 @@
+@@ -1333,7 +_,7 @@
                                          }
                                          // CraftBukkit end
                                          livingEntity2.knockback(
@@ -99,7 +99,7 @@
                                              , this, io.papermc.paper.event.entity.EntityKnockbackEvent.Cause.SWEEP_ATTACK // CraftBukkit // Paper - knockback events
                                          );
                                          // CraftBukkit - moved up
-@@ -1421,7 +_,7 @@
+@@ -1423,7 +_,7 @@
                              if (target instanceof LivingEntity) {
                                  float f7 = f3 - ((LivingEntity)target).getHealth();
                                  this.awardStat(Stats.DAMAGE_DEALT, Math.round(f7 * 10.0F));
@@ -108,7 +108,7 @@
                                      int i = (int)(f7 * 0.5);
                                      ((ServerLevel)this.level())
                                          .sendParticles(ParticleTypes.DAMAGE_INDICATOR, target.getX(), target.getY(0.5), target.getZ(), i, 0.1, 0.0, 0.1, 0.2);
-@@ -1824,6 +_,7 @@
+@@ -1826,6 +_,7 @@
  
      // Paper start - send while respecting visibility
      private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
@@ -116,7 +116,7 @@
          fromEntity.level().playSound(fromEntity, x, y, z, soundEffect, soundCategory, volume, pitch); // This will not send the effect to the entity itself
          if (fromEntity instanceof ServerPlayer serverPlayer) {
              serverPlayer.connection.send(new net.minecraft.network.protocol.game.ClientboundSoundPacket(net.minecraft.core.registries.BuiltInRegistries.SOUND_EVENT.wrapAsHolder(soundEffect), soundCategory, x, y, z, volume, pitch, fromEntity.random.nextLong()));
-@@ -2210,7 +_,13 @@
+@@ -2212,7 +_,13 @@
  
      @Override
      public EntityDimensions getDefaultDimensions(Pose pose) {