A collection of small fixes

paper-api/src/main/java/org/bukkit/RegionAccessor.java

@@ -101,7 +101,7 @@ default BlockState getBlockState(@NotNull Location location) {
     }
 
     /**
-     * Gets the {@link BlockState} at the given {@link Location}.
+     * Gets the {@link BlockState} at the given {@link Vector}.
      *
      * @param location The location of the block state
      * @return Block state at the given location
@@ -169,7 +169,7 @@ default BlockData getBlockData(@NotNull Location location) {
     }
 
     /**
-     * Gets the {@link BlockData} at the given {@link Location}.
+     * Gets the {@link BlockData} at the given {@link Vector}.
      *
      * @param location The location of the block data
      * @return Block data at the given location
@@ -223,7 +223,7 @@ default void setBlockData(@NotNull Location location, @NotNull BlockData blockDa
     }
 
     /**
-     * Sets the {@link BlockData} at the given {@link Location}.
+     * Sets the {@link BlockData} at the given {@link Vector}.
      *
      * @param location The location of the block
      * @param blockData The block data to set the block to

paper-api/src/main/java/org/bukkit/entity/Mob.java

@@ -33,7 +33,7 @@ public interface Mob extends LivingEntity, Lootable, Leashable {
      * </ul>
      *
      * @param state a TriState representing the state of the override
-     * @deprecated the client no longer allow to change that setting and will not render the entity
+     * @deprecated the client no longer allows to change that setting and will not render the entity
      */
     @Deprecated(since = "26.2")
     void setDespawnInPeacefulOverride(TriState state);
@@ -48,7 +48,7 @@ public interface Mob extends LivingEntity, Lootable, Leashable {
      *
      * @return a TriState representing the state of the override
      * @see Mob#setDespawnInPeacefulOverride(TriState)
-     * @deprecated the client no longer allow to change that setting and will not render the entity
+     * @deprecated the client no longer allows to change that setting and will not render the entity
      */
     @Deprecated(since = "26.2")
     TriState getDespawnInPeacefulOverride();

paper-api/src/main/java/org/bukkit/event/entity/AreaEffectCloudApplyEvent.java

@@ -33,10 +33,10 @@ public AreaEffectCloud getEntity() {
     }
 
     /**
-     * Retrieves a mutable list of the effected entities
+     * Retrieves a mutable list of the affected entities
      * <p>
      * It is important to note that not every entity in this list
-     * is guaranteed to be effected.  The cloud may die during the
+     * is guaranteed to be affected. The cloud may die during the
      * application of its effects due to the depletion of {@link AreaEffectCloud#getDurationOnUse()}
      * or {@link AreaEffectCloud#getRadiusOnUse()}
      *

paper-api/src/main/java/org/bukkit/event/entity/EntityExhaustionEvent.java

@@ -76,7 +76,7 @@ public void setCancelled(boolean cancel) {
     }
 
     /**
-     * The reason for why a PlayerExhaustionEvent takes place
+     * The reason for why a EntityExhaustionEvent takes place
      */
     public enum ExhaustionReason {
 

paper-api/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java

@@ -127,7 +127,7 @@ public enum RegainReason {
          */
         WITHER_SPAWN,
         /**
-         * When an entity is damaged by the Wither potion effect
+         * When a wither regains health after killing an entity with a wither skull
          */
         WITHER,
         /**

paper-api/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java

@@ -54,7 +54,7 @@ public ThrownPotion getPotion() {
     }
 
     /**
-     * Retrieves a list of all effected entities
+     * Retrieves a list of all affected entities
      *
      * @return A fresh copy of the affected entity list
      */

paper-api/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java

@@ -164,7 +164,7 @@ public void disallow(@NotNull final Result result, @NotNull final Component mess
      * @param message Kick message to display to the user
      * @deprecated This method uses a deprecated enum from {@link
      *     PlayerPreLoginEvent}
-     * @see #disallow(Result, String)
+     * @see #disallow(Result, Component)
      */
     @Deprecated
     public void disallow(@NotNull final PlayerPreLoginEvent.Result result, @NotNull final net.kyori.adventure.text.Component message) {

paper-api/src/main/java/org/bukkit/event/player/PlayerShearEntityEvent.java

@@ -32,7 +32,7 @@ public PlayerShearEntityEvent(@NotNull Player player, @NotNull Entity entity, @N
         this.entity = entity;
         this.item = item;
         this.hand = hand;
-        this.drops = drops;
+        this.drops = List.copyOf(drops);
     }
 
     @ApiStatus.Internal

paper-server/src/main/java/ca/spottedleaf/moonrise/common/util/EntityUtil.java

@@ -25,7 +25,7 @@ private static String dumpEntityWithoutReferences(final Entity entity) {
 
         return "{type=" + entity.getClass().getSimpleName() + ",id=" + entity.getId() + ",uuid=" + entity.getUUID() + ",pos=" + formatVec(entity.position())
             + ",mot=" + formatVec(entity.getDeltaMovement()) + ",aabb=" + entity.getBoundingBox() + ",removed=" + entity.getRemovalReason() + ",has_vehicle=" + (entity.getVehicle() != null)
-            + ",passenger_count=" + entity.getPassengers().size();
+            + ",passenger_count=" + entity.getPassengers().size() + "}";
     }
 
     public static String dumpEntity(final Entity entity) {

paper-server/src/main/java/io/papermc/paper/command/brigadier/bukkit/BukkitBrigForwardingMap.java

@@ -69,8 +69,8 @@ public boolean containsValue(@Nullable final Object value) {
 
         for (CommandNode<CommandSourceStack> child : this.getDispatcher().getRoot().getChildren()) {
             // If child is a bukkit command node, we can convert it!
-            if (child instanceof BukkitCommandNode bukkitCommandNode) {
-                return bukkitCommandNode.getBukkitCommand().equals(value);
+            if (child instanceof BukkitCommandNode bukkitCommandNode && bukkitCommandNode.getBukkitCommand().equals(value)) {
+                return true;
             }
         }
 

paper-server/src/main/java/io/papermc/paper/command/subcommands/MobcapsCommand.java

@@ -146,7 +146,7 @@ private void printPlayerMobcaps(final CommandSender sender, final String[] args)
             if (sender instanceof Player pl) {
                 player = pl;
             } else {
-                sender.sendMessage(Component.text("Must specify a player! ex: '/paper playermobcount playerName'", NamedTextColor.RED));
+                sender.sendMessage(Component.text("Must specify a player! ex: '/paper playermobcaps playerName'", NamedTextColor.RED));
                 return;
             }
         } else if (args.length == 1) {

paper-server/src/main/java/io/papermc/paper/configuration/transformation/global/versioned/V31_AllowNetherPropertiesToConfig.java

@@ -22,7 +22,7 @@ public void apply(final ConfigurationNode root) throws ConfigurateException {
         final String raw = server.settings.getProperties().properties.getProperty("allow-nether");
         if (raw != null) {
             final ConfigurationNode node = root.node("misc", "enable-nether");
-            node.set(raw.equals("true"));
+            node.set(Boolean.parseBoolean(raw));
             server.settings.update((config) -> {
                 final Properties newProps = new Properties(config.properties);
                 newProps.remove("allow-nether");

paper-server/src/main/java/io/papermc/paper/datacomponent/item/PaperConsumable.java

@@ -59,6 +59,7 @@ public Consumable.Builder toBuilder() {
             .consumeSeconds(this.consumeSeconds())
             .animation(this.animation())
             .sound(this.sound())
+            .hasConsumeParticles(this.hasConsumeParticles())
             .addEffects(this.consumeEffects());
     }
 

paper-server/src/main/java/io/papermc/paper/datacomponent/item/PaperWrittenBookContent.java

@@ -63,7 +63,7 @@ public boolean resolved() {
     public Book asBook() {
         final Filtered<String> title = this.title();
         return Book.book(
-            Component.text(Objects.requireNonNull(title.filtered(), title::raw)),
+            Component.text(Objects.requireNonNullElseGet(title.filtered(), title::raw)),
             Component.text(this.author()),
             this.pages()
                 .stream()

paper-server/src/main/java/io/papermc/paper/plugin/provider/configuration/serializer/constraints/PluginConfigConstraints.java

@@ -32,7 +32,7 @@ public Constraint<String> make(PluginName data, Type type) {
                 return value -> {
                     if (value != null) {
                         if (RESERVED_KEYS.contains(value.toLowerCase(Locale.ROOT))) {
-                            throw new SerializationException("Restricted name, cannot use '%s' as a plugin name.".formatted(data));
+                            throw new SerializationException("Restricted name, cannot use '%s' as a plugin name.".formatted(value));
                         } else if (value.indexOf(' ') != -1) {
                             // For legacy reasons, the space condition has a separate exception message.
                             throw new SerializationException("Restricted name, cannot use 0x20 (space character) in a plugin name.");

paper-server/src/main/java/io/papermc/paper/plugin/util/NamespaceChecker.java

@@ -10,7 +10,7 @@ public class NamespaceChecker {
         "net.minecraft.",
         "org.bukkit.",
         "io.papermc.paper.",
-        "com.destroystokoyo.paper."
+        "com.destroystokyo.paper."
     };
 
     /**

paper-server/src/main/java/io/papermc/paper/potion/PaperPotionBrewer.java

@@ -35,7 +35,7 @@ public Collection<PotionEffect> getEffects(PotionType type, boolean upgraded, bo
         }
 
         final org.bukkit.potion.PotionType effectivePotionType = org.bukkit.Registry.POTION.get(effectiveKey);
-        Preconditions.checkNotNull(type, "Unknown potion type from data " + effectiveKey.asMinimalString()); // Legacy error message in 1.20.4
+        Preconditions.checkNotNull(effectivePotionType, "Unknown potion type from data " + effectiveKey.asMinimalString()); // Legacy error message in 1.20.4
         return effectivePotionType.getPotionEffects();
     }
 

paper-server/src/main/java/io/papermc/paper/registry/HolderableBase.java

@@ -34,7 +34,7 @@ public final boolean equals(final Object obj) {
     }
 
     @Override
-    public String toString() {
+    public final String toString() {
         return Holderable.super.implToString();
     }
 

paper-server/src/main/java/io/papermc/paper/util/OldEnumHolderable.java

@@ -60,9 +60,4 @@ public int ordinal() {
     private void checkIsReference() {
         Preconditions.checkState(this.holder.kind() == Holder.Kind.REFERENCE, "Cannot call method for this registry item, because it is not registered.");
     }
-
-    @Override
-    public String toString() {
-        return this.implToString();
-    }
 }

paper-server/src/main/java/io/papermc/paper/util/SizeLimitedSet.java

@@ -27,7 +27,7 @@ public boolean add(final E element) {
 
     @Override
     public boolean addAll(final Collection<? extends @Nullable E> collection) {
-        if ((collection.size() + this.size()) >= this.maxSize) {
+        if ((collection.size() + this.size()) > this.maxSize) {
             return false;
         }
         boolean edited = false;

paper-server/src/main/java/io/papermc/paper/world/migration/VanillaWorldMigration.java

@@ -124,8 +124,7 @@ private static void migrateLegacyPdc(
             targetStorage.set(PaperWorldPDC.TYPE, pdc);
             targetStorage.saveAndJoin();
 
-            WorldMigrationSupport.clearLegacyPdc(levelData);
-            context.rootAccess().saveLevelData(levelData);
+            context.rootAccess().saveLevelData(WorldMigrationSupport.clearLegacyPdc(levelData));
         }
     }
 

paper-server/src/main/java/io/papermc/paper/world/migration/WorldMigrationSupport.java

@@ -45,8 +45,8 @@ private WorldMigrationSupport() {
             .orElse(null);
     }
 
-    static void clearLegacyPdc(final Dynamic<?> levelData) {
-        levelData.remove("BukkitValues");
+    static Dynamic<?> clearLegacyPdc(final Dynamic<?> levelData) {
+        return levelData.remove("BukkitValues");
     }
 
     static @Nullable UUID readLegacyUuid(final Path sourceRoot) {

paper-server/src/main/java/org/bukkit/craftbukkit/CraftChunk.java

@@ -100,7 +100,7 @@ public int getZ() {
 
     @Override
     public String toString() {
-        return "CraftChunk{" + "x=" + this.getX() + "z=" + this.getZ() + '}';
+        return "CraftChunk{" + "x=" + this.getX() + ", z=" + this.getZ() + '}';
     }
 
     @Override

paper-server/src/main/java/org/bukkit/craftbukkit/CraftParticle.java

@@ -253,7 +253,6 @@ public ParticleOptions createParticleParam(Particle.GeyserBase data) {
             add("instant_effect", spellFunction);
             add("geyser", geyser);
             add("geyser_plume", geyser);
-            add("geyser", geyser);
             add("geyser_base", geyserBase);
             add("geyser_poof", geyserBase);
         }

paper-server/src/main/java/org/bukkit/craftbukkit/attribute/AttributeMappings.java

@@ -16,7 +16,7 @@ final class AttributeMappings {
         add(6967552254039378640L, -9116175396973475259L, "enchantment.aqua_affinity");
         add(5279725409867744698L, -5150363631200102632L, "attacking");
         add(148071211714102867L, -7685811609035173472L, "attacking");
-        add(6196088217904236654L, -7493791321850887290L, "effect.minining_fatigue");
+        add(6196088217904236654L, -7493791321850887290L, "effect.mining_fatigue");
         add(-5084161844451524480L, -8859020046251006329L, "enchantment.soul_speed");
         add(-7907339078496465106L, -8112074600724210224L, "enchantment.swift_sneak");
         add(6688265815086220243L, -6545541163342161890L, "drinking");

paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java

@@ -172,7 +172,7 @@ public static SpawnRule fromMinecraftRule(SpawnData.CustomSpawnRules rule) {
         InclusiveRange<Integer> blockLight = rule.blockLightLimit();
         InclusiveRange<Integer> skyLight = rule.skyLightLimit();
 
-        return new SpawnRule(blockLight.maxInclusive(), blockLight.maxInclusive(), skyLight.minInclusive(), skyLight.maxInclusive());
+        return new SpawnRule(blockLight.minInclusive(), blockLight.maxInclusive(), skyLight.minInclusive(), skyLight.maxInclusive());
     }
 
     @Override

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java

@@ -61,7 +61,7 @@ public void setCurrentBoostTicks(int ticks) {
         }
 
         int max = this.getHandle().steering.boostTimeTotal();
-        Preconditions.checkArgument(ticks >= 0 && ticks <= max, "boost ticks must not exceed 0 or %s (inclusive)", max);
+        Preconditions.checkArgument(ticks >= 0 && ticks <= max, "boost ticks must be between 0 and %s (inclusive)", max);
 
         this.getHandle().steering.boostTime = ticks;
     }

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftStrider.java

@@ -63,7 +63,7 @@ public void setCurrentBoostTicks(int ticks) {
         }
 
         int max = this.getHandle().steering.boostTimeTotal();
-        Preconditions.checkArgument(ticks >= 0 && ticks <= max, "boost ticks must not exceed 0 or %s (inclusive)", max);
+        Preconditions.checkArgument(ticks >= 0 && ticks <= max, "boost ticks must be between 0 and %s (inclusive)", max);
 
         this.getHandle().steering.boostTime = ticks;
     }

paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java

@@ -576,7 +576,7 @@ public static PlayerBucketEmptyEvent callPlayerBucketEmptyEvent(Level level, net
     }
 
     public static PlayerBucketFillEvent callPlayerBucketFillEvent(Level level, net.minecraft.world.entity.player.Player player, BlockPos changed, BlockPos clicked, Direction clickedFace, ItemStack itemInHand, net.minecraft.world.item.Item bucket, InteractionHand hand) {
-        return (PlayerBucketFillEvent) CraftEventFactory.getPlayerBucketEvent(true, level, player, clicked, changed, clickedFace, itemInHand, bucket, hand);
+        return (PlayerBucketFillEvent) CraftEventFactory.getPlayerBucketEvent(true, level, player, changed, clicked, clickedFace, itemInHand, bucket, hand);
     }
 
     private static PlayerEvent getPlayerBucketEvent(boolean isFilling, Level level, net.minecraft.world.entity.player.Player player, BlockPos changed, BlockPos clicked, Direction clickedFace, ItemStack bucket, net.minecraft.world.item.Item item, InteractionHand hand) {
@@ -762,8 +762,7 @@ public static boolean doEntityAddEventCalling(Level level, Entity entity, SpawnR
         // Spigot start - SPIGOT-7523: Merge after spawn event and only merge if the event was not cancelled (gets checked above)
         if (entity instanceof net.minecraft.world.entity.ExperienceOrb xp) {
             double radius = level.spigotConfig.expMerge;
-            event = CraftEventFactory.callEntitySpawnEvent(entity); // Call spawn event for ExperienceOrb entities
-            if (radius > 0 && !event.isCancelled() && !entity.isRemoved()) {
+            if (radius > 0) {
                 // Paper start - Maximum exp value when merging; Whole section has been tweaked, see comments for specifics
                 final long maxValue = level.paperConfig().entities.behavior.experienceMergeMaxValue;
                 final boolean mergeUnconditionally = maxValue <= 0;

paper-server/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerTextures.java

@@ -27,7 +27,7 @@ private static void validateTextureUrl(@Nullable URL url) {
         if (url == null) return;
 
         Preconditions.checkArgument(url.getHost().equals(CraftPlayerTextures.MINECRAFT_HOST), "Expected host '%s' but got '%s'", CraftPlayerTextures.MINECRAFT_HOST, url.getHost());
-        Preconditions.checkArgument(url.getPath().startsWith(CraftPlayerTextures.MINECRAFT_PATH), "Expected path starting with '%s' but got '%s", CraftPlayerTextures.MINECRAFT_PATH, url.getPath());
+        Preconditions.checkArgument(url.getPath().startsWith(CraftPlayerTextures.MINECRAFT_PATH), "Expected path starting with '%s' but got '%s'", CraftPlayerTextures.MINECRAFT_PATH, url.getPath());
     }
 
     private static @Nullable URL parseUrl(@Nullable String urlString) {

paper-server/src/main/java/org/bukkit/craftbukkit/structure/CraftStructure.java

@@ -87,7 +87,7 @@ public void place(RegionAccessor regionAccessor, BlockVector location, boolean i
         Preconditions.checkArgument(entityTransformers != null, "EntityTransformers cannot be null");
         location.checkFinite();
 
-        Preconditions.checkArgument(integrity >= 0F && integrity <= 1F, "Integrity value (%S) must be between 0 and 1 inclusive", integrity);
+        Preconditions.checkArgument(integrity >= 0F && integrity <= 1F, "Integrity value (%s) must be between 0 and 1 inclusive", integrity);
 
         RandomSource randomSource = new RandomSourceWrapper(random);
         StructurePlaceSettings definedstructureinfo = new StructurePlaceSettings()

paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java

@@ -506,7 +506,7 @@ public byte[] serializeEntity(org.bukkit.entity.Entity entity, EntitySerializati
             } else {
                 // Ensure misc flag is not needed
                 Preconditions.checkArgument(
-                    nmsEntity.getType().canSerialize() || allowMiscSerialization,
+                    e.getType().canSerialize() || allowMiscSerialization,
                     "Cannot serialize misc non-saveable entity %s(%s) without the MISC flag",
                     e.getType().toShortString(),
                     e.getStringUUID()