More more more more more more more patches

patches/server/Add-PlayerItemFrameChangeEvent.patch

@@ -28,30 +28,33 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                }
 +                // Paper end
                  this.dropItem(source.getEntity(), false);
+                 this.gameEvent(GameEvent.BLOCK_CHANGE, source.getEntity());
                  this.playSound(this.getRemoveItemSound(), 1.0F, 1.0F);
-             }
 @@ -0,0 +0,0 @@ public class ItemFrame extends HangingEntity {
-                             return InteractionResult.FAIL;
                          }
                      }
--
+ 
 -                    this.setItem(itemstack);
 +                    // Paper start - call PlayerItemFrameChangeEvent
-+                    var event = new PlayerItemFrameChangeEvent((org.bukkit.entity.Player) player.getBukkitEntity(), (org.bukkit.entity.ItemFrame) this.getBukkitEntity(), itemstack.asBukkitCopy(), PlayerItemFrameChangeEvent.ItemFrameChangeAction.PLACE);
++                    PlayerItemFrameChangeEvent event = new PlayerItemFrameChangeEvent((org.bukkit.entity.Player) player.getBukkitEntity(), (org.bukkit.entity.ItemFrame) this.getBukkitEntity(), itemstack.asBukkitCopy(), PlayerItemFrameChangeEvent.ItemFrameChangeAction.PLACE);
-+                    if (!event.callEvent()) return InteractionResult.FAIL;
++                    if (!event.callEvent()) {
++                        return InteractionResult.FAIL;
++                    }
 +                    this.setItem(ItemStack.fromBukkitCopy(event.getItemStack()));
-+                    // this.setItem(itemstack);
 +                    // Paper end
+                     this.gameEvent(GameEvent.BLOCK_CHANGE, player);
                      if (!player.getAbilities().instabuild) {
                          itemstack.shrink(1);
                      }
                  }
              } else {
 +                // Paper start - call PlayerItemFrameChangeEvent
-+                var event = new PlayerItemFrameChangeEvent((org.bukkit.entity.Player) player.getBukkitEntity(), (org.bukkit.entity.ItemFrame) this.getBukkitEntity(), this.getItem().asBukkitCopy(), PlayerItemFrameChangeEvent.ItemFrameChangeAction.ROTATE);
++                PlayerItemFrameChangeEvent event = new PlayerItemFrameChangeEvent((org.bukkit.entity.Player) player.getBukkitEntity(), (org.bukkit.entity.ItemFrame) this.getBukkitEntity(), this.getItem().asBukkitCopy(), PlayerItemFrameChangeEvent.ItemFrameChangeAction.ROTATE);
-+                if (!event.callEvent()) return InteractionResult.FAIL;
++                if (!event.callEvent()) {
++                    return InteractionResult.FAIL;
++                }
 +                setItem(ItemStack.fromBukkitCopy(event.getItemStack()), false, false);
 +                // Paper end
                  this.playSound(this.getRotateItemSound(), 1.0F, 1.0F);
                  this.setRotation(this.getRotation() + 1);
-             }
+                 this.gameEvent(GameEvent.BLOCK_CHANGE, player);

patches/server/Add-Wandering-Trader-spawn-rate-config-options.patch

@@ -70,9 +70,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  if (!world.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING)) {
                      return 0;
                  } else {
-@@ -0,0 +0,0 @@ public class WanderingTraderSpawner implements CustomSpawner {
+                     int i = this.spawnChance;
  
-                     this.spawnChance = Mth.clamp(this.spawnChance + 25, 25, 75);
+-                    this.spawnChance = Mth.clamp(this.spawnChance + 25, 25, 75);
                      this.serverLevelData.setWanderingTraderSpawnChance(this.spawnChance);
 +                    this.spawnChance = Mth.clamp(i + world.paperConfig().entities.spawning.wanderingTrader.spawnChanceFailureIncrement, world.paperConfig().entities.spawning.wanderingTrader.spawnChanceMin, world.paperConfig().entities.spawning.wanderingTrader.spawnChanceMax);
 +                    //this.serverLevelData.setWanderingTraderSpawnChance(this.spawnChance); // Paper - We don't need to save this value to disk if it gets set back to a hardcoded value anyways

patches/server/Allow-to-change-the-podium-for-the-EnderDragon.patch

@@ -11,7 +11,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public class EnderDragon extends Mob implements Enemy {
      private final int[] nodeAdjacency = new int[24];
      private final BinaryHeap openSet = new BinaryHeap();
-     private Explosion explosionSource = new Explosion(null, this, null, null, Double.NaN, Double.NaN, Double.NaN, Float.NaN, true, Explosion.BlockInteraction.DESTROY); // CraftBukkit - reusable source for CraftTNTPrimed.getSource()
+     private final Explosion explosionSource; // CraftBukkit - reusable source for CraftTNTPrimed.getSource()
 +    // Paper start - add var for save custom podium
 +    @Nullable
 +    private BlockPos podium;

patches/server/Detail-more-information-in-watchdog-dumps.patch

@@ -60,7 +60,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                packetProcessing.push(listener); // Paper - detailed watchdog information
 +                try { // Paper - detailed watchdog information
                  if (MinecraftServer.getServer().hasStopped() || (listener instanceof ServerGamePacketListenerImpl && ((ServerGamePacketListenerImpl) listener).processedDisconnect)) return; // CraftBukkit, MC-142590
-                 if (listener.getConnection().isConnected()) {
+                 if (listener.isAcceptingMessages()) {
                      co.aikar.timings.Timing timing = co.aikar.timings.MinecraftTimings.getPacketTiming(packet); // Paper - timings
 @@ -0,0 +0,0 @@ public class PacketUtils {
                  } else {

patches/server/Fix-Entity-Position-Desync.patch

@@ -13,8 +13,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -0,0 +0,0 @@ public class ServerEntity {
-                 boolean flag2 = flag1 || this.tickCount % 60 == 0;
+                 boolean flag4 = false;
-                 boolean flag3 = Math.abs(i - this.yRotp) >= 1 || Math.abs(j - this.xRotp) >= 1;
+                 boolean flag5 = false;
  
 -                if (this.tickCount > 0 || this.entity instanceof AbstractArrow) {
 +                if (!(this.entity instanceof net.minecraft.world.entity.decoration.HangingEntity) || this.tickCount > 0 || this.entity instanceof AbstractArrow) { // Paper - Always update position

patches/server/Fix-Spigot-growth-modifiers.patch

@@ -18,7 +18,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      @Override
      protected BlockState getGrowIntoState(BlockState state, RandomSource random) {
--        return (BlockState) super.getGrowIntoState(state, random).setValue(CaveVinesBlock.BERRIES, random.nextFloat() < 0.11F);
+-        return super.getGrowIntoState(state, random).setValue(BERRIES, Boolean.valueOf(random.nextFloat() < 0.11F));
 +        // Paper start
 +        return this.getGrowIntoState(state, random, null);
      }

patches/server/Fix-falling-block-spawn-methods.patch

@@ -17,7 +17,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
              // Paper end
          } else if (FallingBlock.class.isAssignableFrom(clazz)) {
-             BlockPos pos = new BlockPos(x, y, z);
+             BlockPos pos = BlockPos.containing(x, y, z);
 -            entity = FallingBlockEntity.fall(world, pos, this.getHandle().getBlockState(pos));
 +            entity = new FallingBlockEntity(world, x, y, z, this.getHandle().getBlockState(pos)); // Paper
          } else if (Projectile.class.isAssignableFrom(clazz)) {
@@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          Validate.notNull(material, "Material cannot be null");
          Validate.isTrue(material.isBlock(), "Material must be a block");
  
--        FallingBlockEntity entity = FallingBlockEntity.fall(world, new BlockPos(location.getX(), location.getY(), location.getZ()), CraftMagicNumbers.getBlock(material).defaultBlockState(), SpawnReason.CUSTOM);
+-        FallingBlockEntity entity = FallingBlockEntity.fall(world, BlockPos.containing(location.getX(), location.getY(), location.getZ()), CraftMagicNumbers.getBlock(material).defaultBlockState(), SpawnReason.CUSTOM);
 +        // Paper start - restore API behavior for spawning falling blocks
 +        FallingBlockEntity entity = new FallingBlockEntity(this.world, location.getX(), location.getY(), location.getZ(), CraftMagicNumbers.getBlock(material).defaultBlockState()); // Paper
 +        entity.time = 1;
@@ -45,7 +45,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          Validate.notNull(location, "Location cannot be null");
          Validate.notNull(data, "BlockData cannot be null");
  
--        FallingBlockEntity entity = FallingBlockEntity.fall(world, new BlockPos(location.getX(), location.getY(), location.getZ()), ((CraftBlockData) data).getState(), SpawnReason.CUSTOM);
+-        FallingBlockEntity entity = FallingBlockEntity.fall(world, BlockPos.containing(location.getX(), location.getY(), location.getZ()), ((CraftBlockData) data).getState(), SpawnReason.CUSTOM);
 +        // Paper start - restore API behavior for spawning falling blocks
 +        FallingBlockEntity entity = new FallingBlockEntity(this.world, location.getX(), location.getY(), location.getZ(), ((CraftBlockData) data).getState());
 +        entity.time = 1;

patches/server/Fix-upstreams-block-state-factories.patch

@@ -80,6 +80,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                        Material.BAMBOO_WALL_SIGN,
 -                        Material.BIRCH_SIGN,
 -                        Material.BIRCH_WALL_SIGN,
+-                        Material.CHERRY_SIGN,
+-                        Material.CHERRY_WALL_SIGN,
 -                        Material.CRIMSON_SIGN,
 -                        Material.CRIMSON_WALL_SIGN,
 -                        Material.DARK_OAK_SIGN,
@@ -105,6 +107,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                        Material.BAMBOO_WALL_HANGING_SIGN,
 -                        Material.BIRCH_HANGING_SIGN,
 -                        Material.BIRCH_WALL_HANGING_SIGN,
+-                        Material.CHERRY_HANGING_SIGN,
+-                        Material.CHERRY_WALL_HANGING_SIGN,
 -                        Material.CRIMSON_HANGING_SIGN,
 -                        Material.CRIMSON_WALL_HANGING_SIGN,
 -                        Material.DARK_OAK_HANGING_SIGN,
@@ -253,6 +257,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        register(Material.COMPARATOR, CraftComparator.class, CraftComparator::new, ComparatorBlockEntity::new);
 -        register(Material.CONDUIT, CraftConduit.class, CraftConduit::new, ConduitBlockEntity::new);
 -        register(Material.DAYLIGHT_DETECTOR, CraftDaylightDetector.class, CraftDaylightDetector::new, DaylightDetectorBlockEntity::new);
+-        register(Material.DECORATED_POT, CraftDecoratedPot.class, CraftDecoratedPot::new, DecoratedPotBlockEntity::new);
 -        register(Material.DISPENSER, CraftDispenser.class, CraftDispenser::new, DispenserBlockEntity::new);
 -        register(Material.DROPPER, CraftDropper.class, CraftDropper::new, DropperBlockEntity::new);
 -        register(Material.ENCHANTING_TABLE, CraftEnchantingTable.class, CraftEnchantingTable::new, EnchantmentTableBlockEntity::new);
@@ -271,6 +276,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        register(Material.SMOKER, CraftSmoker.class, CraftSmoker::new, SmokerBlockEntity::new);
 -        register(Material.SPAWNER, CraftCreatureSpawner.class, CraftCreatureSpawner::new, SpawnerBlockEntity::new);
 -        register(Material.STRUCTURE_BLOCK, CraftStructureBlock.class, CraftStructureBlock::new, StructureBlockEntity::new);
+-        register(Material.SUSPICIOUS_SAND, CraftSuspiciousSand.class, CraftSuspiciousSand::new, SuspiciousSandBlockEntity::new);
 -        register(Material.TRAPPED_CHEST, CraftChest.class, CraftChest::new, TrappedChestBlockEntity::new);
 +        // Paper start - simplify
 +        register(BlockEntityType.SIGN, CraftSign.class, CraftSign::new);
@@ -292,6 +298,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        register(BlockEntityType.COMPARATOR, CraftComparator.class, CraftComparator::new);
 +        register(BlockEntityType.CONDUIT, CraftConduit.class, CraftConduit::new);
 +        register(BlockEntityType.DAYLIGHT_DETECTOR, CraftDaylightDetector.class, CraftDaylightDetector::new);
++        register(BlockEntityType.DECORATED_POT, CraftDecoratedPot.class, CraftDecoratedPot::new);
 +        register(BlockEntityType.DISPENSER, CraftDispenser.class, CraftDispenser::new);
 +        register(BlockEntityType.DROPPER, CraftDropper.class, CraftDropper::new);
 +        register(BlockEntityType.ENCHANTING_TABLE, CraftEnchantingTable.class, CraftEnchantingTable::new);
@@ -310,6 +317,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        register(BlockEntityType.SMOKER, CraftSmoker.class, CraftSmoker::new);
 +        register(BlockEntityType.MOB_SPAWNER, CraftCreatureSpawner.class, CraftCreatureSpawner::new);
 +        register(BlockEntityType.STRUCTURE_BLOCK, CraftStructureBlock.class, CraftStructureBlock::new);
++        register(BlockEntityType.SUSPICIOUS_SAND, CraftSuspiciousSand.class, CraftSuspiciousSand::new);
 +        register(BlockEntityType.TRAPPED_CHEST, CraftChest.class, CraftChest::new);
 +        // Paper end
      }

patches/server/Freeze-Tick-Lock-API.patch

@@ -49,15 +49,15 @@ diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/ma
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity {
+@@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity implements Attackable {
-         boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES);
-         int i;
  
+         this.level.getProfiler().pop();
+         this.level.getProfiler().push("freezing");
 -        if (!this.level.isClientSide && !this.isDeadOrDying()) {
 +        if (!this.level.isClientSide && !this.isDeadOrDying() && !freezeLocked) { // Paper - Freeze Tick Lock API
-             i = this.getTicksFrozen();
+             int i = this.getTicksFrozen();
+ 
              if (this.isInPowderSnow && this.canFreeze()) {
-                 this.setTicksFrozen(Math.min(this.getTicksRequiredToFreeze(), i + 1));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java

patches/server/Hide-unnecessary-itemmeta-from-clients.patch

@@ -36,7 +36,7 @@ diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/ma
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity {
+@@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
              // Paper start - prevent oversized data
              ItemStack toSend = sanitizeItemStack(itemstack1, true);
@@ -45,7 +45,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              // Paper end
              switch (enumitemslot.getType()) {
                  case HAND:
-@@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity {
+@@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity implements Attackable {
          ((ServerLevel) this.level).getChunkSource().broadcast(this, new ClientboundSetEquipmentPacket(this.getId(), list));
      }
  

patches/server/Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch

@@ -1278,11 +1278,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        boolean flag2 = movement.z != vec3d1.z;
 -        boolean flag3 = this.onGround || flag1 && movement.y < 0.0D;
 -
--        if (this.maxUpStep > 0.0F && flag3 && (flag || flag2)) {
+-        if (this.maxUpStep() > 0.0F && flag3 && (flag || flag2)) {
--            Vec3 vec3d2 = Entity.collideBoundingBox(this, new Vec3(movement.x, (double) this.maxUpStep, movement.z), axisalignedbb, this.level, list);
+-            Vec3 vec3d2 = Entity.collideBoundingBox(this, new Vec3(movement.x, (double) this.maxUpStep(), movement.z), axisalignedbb, this.level, list);
--            Vec3 vec3d3 = Entity.collideBoundingBox(this, new Vec3(0.0D, (double) this.maxUpStep, 0.0D), axisalignedbb.expandTowards(movement.x, 0.0D, movement.z), this.level, list);
+-            Vec3 vec3d3 = Entity.collideBoundingBox(this, new Vec3(0.0D, (double) this.maxUpStep(), 0.0D), axisalignedbb.expandTowards(movement.x, 0.0D, movement.z), this.level, list);
 -
--            if (vec3d3.y < (double) this.maxUpStep) {
+-            if (vec3d3.y < (double) this.maxUpStep()) {
 -                Vec3 vec3d4 = Entity.collideBoundingBox(this, new Vec3(movement.x, 0.0D, movement.z), axisalignedbb.move(vec3d3), this.level, list).add(vec3d3);
 -
 -                if (vec3d4.horizontalDistanceSqr() > vec3d2.horizontalDistanceSqr()) {
@@ -1302,7 +1302,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +        final List<AABB> potentialCollisions = io.papermc.paper.util.CachedLists.getTempCollisionList();
 +        try {
-+            final double stepHeight = (double)this.maxUpStep;
++            final double stepHeight = (double)this.maxUpStep();
 +            final AABB collisionBox;
 +
 +            if (movement.x == 0.0 && movement.z == 0.0 && movement.y != 0.0) {

patches/server/Kick-on-main-for-illegal-chat.patch

@@ -38,5 +38,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              this.disconnect(Component.translatable("multiplayer.disconnect.out_of_order_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event ca
 +            }); // Paper - push to main
              return Optional.empty();
-         } else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
+         } else {
-             this.send(new ClientboundSystemChatPacket(PaperAdventure.asAdventure(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED)), false)); // Paper - Adventure
+             Optional<LastSeenMessages> optional = this.unpackAndApplyLastSeen(acknowledgment);

patches/server/Manually-inline-methods-in-BlockPosition.patch

@@ -59,5 +59,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    protected int y; // Paper - protected
 +    protected int z; // Paper - protected
  
-     private static Function<Vec3i, DataResult<Vec3i>> checkOffsetAxes(int maxAbsValue) {
+     public static Codec<Vec3i> offsetCodec(int maxAbsValue) {
-         return (vec) -> {
+         return ExtraCodecs.validate(CODEC, (vec) -> {