Update to 26.3-pre-3

Author: lynxplay

gradle.properties

@@ -1,5 +1,5 @@
 group=io.papermc.paper
-mcVersion=26.3-pre-2
+mcVersion=26.3-pre-3
 # This is the current API version for use in (paper-)plugin.yml files
 # During snapshot cycles this should be the anticipated version of the release target
 apiVersion=26.3

paper-server/build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
 
 dependencies {
-    mache("io.papermc:mache:26.3-pre-2+build.2")
+    mache("io.papermc:mache:26.3-pre-3+build.1")
     paperclip("io.papermc:paperclip:3.0.4")
 }
 

paper-server/patches/sources/net/minecraft/server/level/ServerPlayerGameMode.java.patch

@@ -91,11 +91,11 @@
          final BlockPos pos, final ServerboundPlayerActionPacket.Action action, final Direction direction, final int maxY, final int sequence
      ) {
          if (!this.player.isWithinBlockInteractionRange(pos, 1.0)) {
-+            if (true) return; // Paper - Don't allow digging into unloaded chunks; Don't notify if unreasonably far away
-             this.debugLogging(pos, false, sequence, "too far");
-         } else if (pos.getY() > maxY) {
-             this.player.connection.send(new ClientboundBlockUpdatePacket(pos, this.level.getBlockState(pos)));
-@@ -178,16 +_,35 @@
++            if (true) return; // Paper - Don't allow digging into unloaded chunks; Don't notify if unreasonably far away // TODO - snapshot - revisit now that there is logic involved here
+             if (this.isDestroyingBlock && action == ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK) {
+                 this.abortDestroyBlock(pos, sequence);
+             }
+@@ -182,16 +_,35 @@
                  }
 
                  if (!this.level.mayInteract(this.player, pos)) {
@@ -133,7 +133,7 @@
                  if (this.player.blockActionRestricted(this.level, pos, this.gameModeForPlayer)) {
                      this.player.connection.send(new ClientboundBlockUpdatePacket(pos, this.level.getBlockState(pos)));
                      this.debugLogging(pos, false, sequence, "block action restricted");
-@@ -197,7 +_,7 @@
+@@ -201,7 +_,7 @@
                  this.destroyProgressStart = this.gameTicks;
                  float progress = 1.0F;
                  BlockState blockState = this.level.getBlockState(pos);
@@ -142,7 +142,7 @@
                      EnchantmentHelper.onHitBlock(
                          this.level,
                          this.player.getMainHandItem(),
-@@ -212,6 +_,23 @@
+@@ -216,6 +_,23 @@
                      progress = blockState.getDestroyProgress(this.player, this.player.level(), pos);
                  }
 
@@ -166,32 +166,32 @@
                  if (!blockState.isAir() && progress >= 1.0F) {
                      this.destroyAndAck(pos, sequence, "insta mine");
                  } else {
-@@ -255,14 +_,22 @@
-                 this.debugLogging(pos, true, sequence, "stopped destroying");
-             } else if (action == ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK) {
-                 this.isDestroyingBlock = false;
--                if (!Objects.equals(this.destroyPos, pos)) {
--                    LOGGER.warn("Mismatch in destroy block pos: {} {}", this.destroyPos, pos);
-+                // Paper start - Don't allow digging into unloaded chunks
-+                if (!Objects.equals(this.destroyPos, pos) && !BlockPos.ZERO.equals(this.destroyPos)) { // Paper
-+                    ServerPlayerGameMode.LOGGER.debug("Mismatch in destroy block pos: {} {}", this.destroyPos, pos); // CraftBukkit - SPIGOT-5457 sent by client when interact event cancelled
-+                    BlockState destroyState = this.level.getBlockStateIfLoaded(this.destroyPos); // Don't load unloaded chunks for stale records here
-+                    if (destroyState != null) {
-                     this.level.destroyBlockProgress(this.player.getId(), this.destroyPos, -1);
-                     this.debugLogging(pos, true, sequence, "aborted mismatched destroying");
-+                    }
-+                    this.destroyPos = BlockPos.ZERO;
-+                    // Paper end - Don't allow digging into unloaded chunks
-                 }
+@@ -265,14 +_,22 @@
 
-                 this.level.destroyBlockProgress(this.player.getId(), pos, -1);
-                 this.debugLogging(pos, true, sequence, "aborted destroying");
-+
-+                org.bukkit.craftbukkit.event.CraftEventFactory.callBlockDamageAbortEvent(this.player, pos, this.player.getInventory().getSelectedItem()); // CraftBukkit
-             }
+     private void abortDestroyBlock(final BlockPos pos, final int sequence) {
+         this.isDestroyingBlock = false;
+-        if (!Objects.equals(this.destroyPos, pos)) {
+-            LOGGER.warn("Mismatch in destroy block pos: {} {}", this.destroyPos, pos);
++        // Paper start - Don't allow digging into unloaded chunks
++        if (!Objects.equals(this.destroyPos, pos) && !BlockPos.ZERO.equals(this.destroyPos)) { // Paper
++            ServerPlayerGameMode.LOGGER.debug("Mismatch in destroy block pos: {} {}", this.destroyPos, pos); // CraftBukkit - SPIGOT-5457 sent by client when interact event cancelled
++            BlockState destroyState = this.level.getBlockStateIfLoaded(this.destroyPos); // Don't load unloaded chunks for stale records here
++            if (destroyState != null) {
+             this.level.destroyBlockProgress(this.player.getId(), this.destroyPos, -1);
+             this.debugLogging(pos, true, sequence, "aborted mismatched destroying");
++            }
++            this.destroyPos = BlockPos.ZERO;
++            // Paper end - Don't allow digging into unloaded chunks
          }
+ 
+         this.level.destroyBlockProgress(this.player.getId(), pos, -1);
+         this.debugLogging(pos, true, sequence, "aborted destroying");
++
++        org.bukkit.craftbukkit.event.CraftEventFactory.callBlockDamageAbortEvent(this.player, pos, this.player.getInventory().getSelectedItem()); // CraftBukkit
      }
-@@ -278,13 +_,53 @@
+ 
+     public void destroyAndAck(final BlockPos pos, final int sequence, final String exitId) {
+@@ -286,13 +_,53 @@
 
      public boolean destroyBlock(final BlockPos pos) {
          BlockState state = this.level.getBlockState(pos);
@@ -248,7 +248,7 @@
              this.level.sendBlockUpdated(pos, state, state, Block.UPDATE_ALL);
              return false;
          }
-@@ -293,6 +_,10 @@
+@@ -301,6 +_,10 @@
              return false;
          }
 
@@ -259,7 +259,7 @@
          BlockState adjustedState = block.playerWillDestroy(this.level, pos, state, this.player);
          boolean changed = this.level.removeBlock(pos, false);
          if (SharedConstants.DEBUG_BLOCK_BREAK) {
-@@ -303,17 +_,38 @@
+@@ -311,17 +_,38 @@
              block.destroy(this.level, pos, adjustedState);
          }
 
@@ -305,15 +305,15 @@
 
          return true;
      }
-@@ -329,6 +_,7 @@
+@@ -337,6 +_,7 @@
 
          int oldCount = itemStack.getCount();
          int oldDamage = itemStack.getDamageValue();
 +        final ItemStack stackBeforeUse = itemStack.copy(); // Paper - Store stack before use for interact prediction check
          InteractionResult result = itemStack.use(level, player, hand);
          ItemStack resultStack;
          if (result instanceof InteractionResult.Success success) {
-@@ -357,25 +_,70 @@
+@@ -365,25 +_,70 @@
          }
 
          if (!player.isUsingItem()) {
@@ -387,7 +387,7 @@
                  return InteractionResult.CONSUME;
              }
 
-@@ -416,7 +_,7 @@
+@@ -424,7 +_,7 @@
                  }
              }
 
@@ -396,7 +396,7 @@
                  UseOnContext context = new UseOnContext(player, hand, hitResult);
                  InteractionResult result;
                  if (player.hasInfiniteMaterials()) {
-@@ -439,6 +_,11 @@
+@@ -447,6 +_,11 @@
 
                  return result;
              } else {

paper-server/patches/sources/net/minecraft/util/Util.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/util/Util.java
 +++ b/net/minecraft/util/Util.java
-@@ -104,9 +_,25 @@
+@@ -103,9 +_,25 @@
      private static final int DEFAULT_MAX_THREADS = 255;
      private static final int DEFAULT_SAFE_FILE_OPERATION_RETRIES = 10;
      private static final String MAX_THREADS_SYSTEM_PROPERTY = "max.bg.threads";
@@ -28,15 +28,15 @@
      private static final DateTimeFormatter FILENAME_DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss", Locale.ROOT);
      public static final int LINEAR_LOOKUP_THRESHOLD = 8;
      private static final Set<String> ALLOWED_UNTRUSTED_LINK_PROTOCOLS = Set.of("http", "https");
-@@ -148,6 +_,7 @@
+@@ -147,6 +_,7 @@
          escaper.addEscape('\\', "\\\\");
      }).build();
      private static Consumer<String> thePauser = msg -> {};
 +    public static final double COLLISION_EPSILON = 1.0E-7; // Paper - Check distance in entity interactions
 
      public static <K, V> Collector<Entry<? extends K, ? extends V>, ?, Map<K, V>> toMap() {
          return Collectors.toMap(Entry::getKey, Entry::getValue);
-@@ -183,7 +_,7 @@
+@@ -182,7 +_,7 @@
      }
 
      public static long getNanos() {
@@ -45,7 +45,7 @@
      }
 
      public static long getEpochMillis() {
-@@ -198,9 +_,10 @@
+@@ -197,9 +_,10 @@
          return FILENAME_DATE_TIME_FORMATTER.format(ZonedDateTime.now());
      }
 
@@ -58,7 +58,7 @@
          if (threads <= 0) {
              executor = MoreExecutors.newDirectExecutorService();
          } else {
-@@ -225,16 +_,30 @@
+@@ -224,16 +_,30 @@
                          super.onTermination(exception);
                      }
                  };
@@ -91,7 +91,7 @@
      }
 
      private static int getMaxThreads() {
-@@ -283,6 +_,21 @@
+@@ -282,6 +_,21 @@
              return thread;
          }));
      }

paper-server/patches/sources/net/minecraft/util/datafix/DataFixers.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/util/datafix/DataFixers.java
 +++ b/net/minecraft/util/datafix/DataFixers.java
-@@ -568,6 +_,24 @@
+@@ -569,6 +_,24 @@
          Schema v1456 = fixerUpper.addSchema(1456, SAME_NAMESPACED);
          fixerUpper.addFixer(new EntityItemFrameDirectionFix(v1456, false));
          Schema v1458 = fixerUpper.addSchema(1458, V1458::new);

paper-server/patches/sources/net/minecraft/world/entity/item/FallingBlockEntity.java.patch

@@ -1,22 +1,22 @@
 --- a/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -73,6 +_,7 @@
+@@ -74,6 +_,7 @@
      public @Nullable CompoundTag blockData;
      public boolean forceTickAfterTeleportToDuplicate;
      protected static final EntityDataAccessor<BlockPos> DATA_START_POS = SynchedEntityData.defineId(FallingBlockEntity.class, EntityDataSerializers.BLOCK_POS);
 +    public boolean autoExpire = true; // Paper - Expand FallingBlock API
 
      public FallingBlockEntity(final EntityType<? extends FallingBlockEntity> type, final Level level) {
          super(type, level);
-@@ -98,6 +_,7 @@
+@@ -99,6 +_,7 @@
              pos.getZ() + 0.5,
              state.hasProperty(BlockStateProperties.WATERLOGGED) ? state.setValue(BlockStateProperties.WATERLOGGED, false) : state
          );
 +        if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entity, pos, state.getFluidState().createLegacyBlock())) return entity; // CraftBukkit
          level.setBlockAndUpdate(pos, state.getFluidState().createLegacyBlock());
          level.addFreshEntity(entity);
          return entity;
-@@ -148,13 +_,22 @@
+@@ -149,13 +_,22 @@
      @Override
      public void tick() {
          if (this.blockState.isAir()) {
@@ -40,7 +40,7 @@
              this.handlePortal();
              if (this.level() instanceof ServerLevel serverLevel && (this.isAlive() || this.forceTickAfterTeleportToDuplicate)) {
                  BlockPos pos = this.blockPosition();
-@@ -175,12 +_,12 @@
+@@ -176,12 +_,12 @@
                  }
 
                  if (!this.onGround() && !isStuckInWater) {
@@ -55,7 +55,7 @@
                      }
                  } else {
                      BlockState currentState = this.level().getBlockState(pos);
-@@ -197,11 +_,17 @@
+@@ -198,6 +_,12 @@
                                      this.blockState = this.blockState.setValue(BlockStateProperties.WATERLOGGED, true);
                                  }
 
@@ -68,13 +68,16 @@
                                  if (this.level().setBlockAndUpdate(pos, this.blockState)) {
                                      serverLevel.getChunkSource()
                                          .chunkMap
-                                         .sendToTrackingPlayers(this, new ClientboundBlockUpdatePacket(pos, this.level().getBlockState(pos)));
+@@ -205,7 +_,7 @@
+                                     serverLevel.getChunkSource()
+                                         .chunkMap
+                                         .sendToTrackingPlayers(this, new ClientboundAddTransientBlockPacket(pos, this.level().getBlockState(pos)));
 -                                    this.discard();
 +                                    this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
                                      if (block instanceof Fallable fallable) {
                                          fallable.onLand(this.level(), pos, this.blockState, currentState, this);
                                      }
-@@ -226,19 +_,19 @@
+@@ -230,19 +_,19 @@
                                          }
                                      }
                                  } else if (this.dropItem && serverLevel.getGameRules().get(GameRules.ENTITY_DROPS)) {
@@ -97,15 +100,15 @@
                              this.callOnBrokenAfterFall(block, pos);
                          }
                      }
-@@ -299,6 +_,7 @@
+@@ -303,6 +_,7 @@
          }
 
          output.putBoolean("CancelDrop", this.cancelDrop);
 +        if (!this.autoExpire) output.putBoolean("Paper.AutoExpire", false); // Paper - Expand FallingBlock API
      }
 
      @Override
-@@ -310,8 +_,9 @@
+@@ -314,8 +_,9 @@
          this.fallDamagePerDistance = input.getFloatOr("FallHurtAmount", 0.0F);
          this.fallDamageMax = input.getIntOr("FallHurtMax", 40);
          this.dropItem = input.getBooleanOr("DropItem", true);
@@ -116,7 +119,7 @@
      }
 
      public void setHurtsEntities(final float damagePerDistance, final int damageMax) {
-@@ -367,7 +_,7 @@
+@@ -371,7 +_,7 @@
          ResourceKey<Level> oldDimension = this.level().dimension();
          boolean fromOrToEnd = (oldDimension == Level.END || newDimension == Level.END) && oldDimension != newDimension;
          Entity newEntity = super.teleport(transition);

paper-server/patches/sources/net/minecraft/world/entity/npc/villager/Villager.java.patch

@@ -13,8 +13,8 @@
 +            // CraftBukkit end
          }
 
-         this.resendOffersToTradingPlayer();
-@@ -401,7 +_,12 @@
+         Player tradingPlayer = this.getTradingPlayer();
+@@ -390,7 +_,12 @@
          int missedUpdates = 2 - this.numberOfRestocksToday;
          if (missedUpdates > 0) {
              for (MerchantOffer offer : this.getOffers()) {
@@ -28,14 +28,14 @@
              }
          }
 
-@@ -426,6 +_,7 @@
-         boolean offersChanged = false;
+@@ -418,6 +_,7 @@
+         MerchantOffers merchantOffers = this.getOffers();
 
-         for (MerchantOffer offer : this.getOffers()) {
+         for (MerchantOffer offer : merchantOffers) {
 +            if (offer.ignoreDiscounts) continue; // Paper - Add ignore discounts API
              if (reputation != 0) {
                  offer.addToSpecialPriceDiff(-Mth.floor(reputation * offer.getPriceMultiplier()));
-                 offersChanged = true;
+             }
 @@ -562,14 +_,14 @@
          if (this.shouldIncreaseLevel()) {
              if (this.level() instanceof ServerLevel serverLevel) {
@@ -112,17 +112,17 @@
              if (SharedConstants.DEBUG_UNLOCK_ALL_TRADES && data.level() < 5) {
                  this.increaseMerchantCareer(level);
              }
-@@ -818,7 +_,9 @@
+@@ -817,7 +_,9 @@
+             if (tradingPlayer != null) {
                  this.updateSpecialPrices(tradingPlayer);
-                 this.resendOffersToTradingPlayer();
              }
 +            return true; // Paper - More vanilla friendly methods to update trades
          }
 +        return false; // Paper - More vanilla friendly methods to update trades
      }
 
      public void gossip(final ServerLevel level, final Villager target, final long timestamp) {
-@@ -855,7 +_,7 @@
+@@ -853,7 +_,7 @@
                  .limit(5L)
                  .toList();
              if (nearbyVillagersThatWantAGolem.size() >= villagersNeededToAgree) {
@@ -131,7 +131,7 @@
                          EntityTypes.IRON_GOLEM,
                          EntitySpawnReason.MOB_SUMMONED,
                          level,
-@@ -864,9 +_,11 @@
+@@ -862,9 +_,11 @@
                          8,
                          6,
                          SpawnUtil.Strategy.LEGACY_IRON_GOLEM,

paper-server/patches/sources/net/minecraft/world/inventory/MerchantResultSlot.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/inventory/MerchantResultSlot.java
 +++ b/net/minecraft/world/inventory/MerchantResultSlot.java
-@@ -47,13 +_,34 @@
+@@ -59,13 +_,34 @@
 
      @Override
      public void onTake(final Player player, final ItemStack carried) {

paper-server/patches/sources/net/minecraft/world/level/block/CampfireBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/block/CampfireBlock.java
 +++ b/net/minecraft/world/level/block/CampfireBlock.java
-@@ -116,8 +_,9 @@
+@@ -117,8 +_,9 @@
          final InsideBlockEffectApplier effectApplier,
          final boolean isPrecise
      ) {
@@ -11,7 +11,7 @@
          }
 
          super.entityInside(state, level, pos, entity, effectApplier, isPrecise);
-@@ -228,6 +_,11 @@
+@@ -229,6 +_,11 @@
              && projectile.mayInteract(serverLevel, pos)
              && !state.getValue(LIT)
              && !state.getValue(WATERLOGGED)) {