update some patches

patches/server/Fix-inconsistencies-in-dispense-events-regarding-sta.patch

@@ -146,9 +146,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                          DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
 @@ -0,0 +0,0 @@ public interface DispenseItemBehavior {
                      }
+                     ((Saddleable) list.get(0)).equipSaddle(itemstack1, SoundSource.BLOCKS);
                      // CraftBukkit end
-                     ((Saddleable) list.get(0)).equipSaddle(SoundSource.BLOCKS, CraftItemStack.asNMSCopy(event.getItem())); // Paper - Fix saddles losing nbt data - MC-191591
--                    // itemstack.shrink(1); // CraftBukkit - handled above
 +                    if (shrink) stack.shrink(1); // Paper - actually handle here
                      this.setSuccess(true);
                      return stack;
@@ -386,7 +385,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public class ArmorItem extends Item implements Equipable {
          } else {
              LivingEntity entityliving = (LivingEntity) list.get(0);
-             EquipmentSlot enumitemslot = Mob.getEquipmentSlotForItem(armor);
+             EquipmentSlot enumitemslot = entityliving.getEquipmentSlotForItem(armor);
 -            ItemStack itemstack1 = armor.split(1);
 +            ItemStack itemstack1 = armor.copyWithCount(1); // Paper - shrink below and single item in event
              // CraftBukkit start

patches/server/Fix-premature-player-kicks-on-shutdown.patch

@@ -44,7 +44,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                          ;
 +                    } catch (io.papermc.paper.util.ServerStopRejectedExecutionException ignored) { // Paper - do not prematurely disconnect players on stop
                      } catch (RejectedExecutionException rejectedexecutionexception) {
-                         this.disconnect(Component.translatable("multiplayer.disconnect.server_shutdown"));
+                         this.disconnect((Component) Component.translatable("multiplayer.disconnect.server_shutdown"));
                      } catch (ClassCastException classcastexception) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644

patches/server/Flying-Fall-Damage.patch

@@ -9,8 +9,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -0,0 +0,0 @@ public abstract class Player extends LivingEntity {
-     public Entity currentExplosionCause;
-     public boolean ignoreFallDamageFromCurrentImpulse;
+     private boolean ignoreFallDamageFromCurrentImpulse;
+     private int currentImpulseContextResetGraceTime;
      public boolean affectsSpawning = true; // Paper - Affects Spawning API
 +    public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage
  

patches/server/Friction-API.patch

@@ -51,8 +51,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            }
 +        }
 +        // Paper end - Friction API
-         if (nbt.contains("Attributes", 9) && this.level() != null && !this.level().isClientSide) {
-             this.getAttributes().load(nbt.getList("Attributes", 10));
+         if (nbt.contains("attributes", 9) && this.level() != null && !this.level().isClientSide) {
+             this.getAttributes().load(nbt.getList("attributes", 10));
          }
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
@@ -137,10 +137,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-         nmsStack.hurtAndBreakWithoutChecks(amount, this.getHandle(), slot);
+         nmsStack.hurtAndBreak(amount, this.getHandle(), slot, true);
      }
      // Paper end - ItemStack damage API
-+
 +    // Paper start - friction API
 +    @org.jetbrains.annotations.NotNull
 +    @Override

patches/server/Improve-PortalEvents.patch

@@ -9,8 +9,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+         org.bukkit.entity.Entity bukkitEntity = entity.getBukkitEntity();
          Location enter = bukkitEntity.getLocation();
-         Location exit = CraftLocation.toBukkit(exitPosition, exitWorldServer.getWorld());
  
 -        EntityPortalEvent event = new EntityPortalEvent(bukkitEntity, enter, exit, searchRadius);
 +        // Paper start

patches/server/Limit-pet-look-distance.patch

@@ -9,11 +9,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java
 @@ -0,0 +0,0 @@ public class FollowOwnerGoal extends Goal {
- 
-     @Override
      public void tick() {
--        this.tamable.getLookControl().setLookAt(this.owner, 10.0F, (float) this.tamable.getMaxHeadXRot());
-+        if (this.tamable.distanceToSqr(this.owner) <= 16 * 16) this.tamable.getLookControl().setLookAt(this.owner, 10.0F, (float) this.tamable.getMaxHeadXRot()); // Paper - Limit pet look distance
+         boolean bl = this.tamable.shouldTryTeleportToOwner();
+         if (!bl) {
+-            this.tamable.getLookControl().setLookAt(this.owner, 10.0F, (float)this.tamable.getMaxHeadXRot());
++            if (this.tamable.distanceToSqr(this.owner) <= 16 * 16) this.tamable.getLookControl().setLookAt(this.owner, 10.0F, (float)this.tamable.getMaxHeadXRot()); // Paper - Limit pet look distance
+         }
+ 
          if (--this.timeToRecalcPath <= 0) {
-             this.timeToRecalcPath = this.adjustedTickDelay(10);
-             if (this.tamable.distanceToSqr((Entity) this.owner) >= 144.0D) {

patches/server/Sync-offhand-slot-in-menus.patch

@@ -11,7 +11,7 @@ diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/ma
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -0,0 +0,0 @@ public class ServerPlayer extends Player {
+@@ -0,0 +0,0 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
  
              }