Fix IndexOutOfBoundsException on BlockFertilizeEvent

Back to snapshot for development
Release 7.5.1
2025-07-04 14:44:43 +02:00 · 2025-02-24 16:59:23 +01:00 · 2025-02-23 20:57:47 +00:00 · 2025-02-23 20:46:30 +00:00 · 2025-02-23 20:25:17 +00:00 · 2025-02-23 14:35:55 +00:00
25 changed files with 205 additions and 77 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -27,6 +27,7 @@ body:
      description: Which server version are you using? If your server version is not listed, it is not supported. Update to a supported version first.
      multiple: false
      options:
+        - '1.21.4'
        - '1.21.3'
        - '1.21.1'
        - '1.20.6'
--- a/Bukkit/build.gradle.kts
+++ b/Bukkit/build.gradle.kts
@ -39,7 +39,9 @@ dependencies {
    }
    compileOnly(libs.placeholderapi)
    compileOnly(libs.luckperms)
-    compileOnly(libs.essentialsx)
+    compileOnly(libs.essentialsx) {
+        exclude(group = "org.spigotmc")
+    }
    compileOnly(libs.mvdwapi) { isTransitive = false }

    // Other libraries
@ -101,7 +103,7 @@ tasks {
    withType<Javadoc> {
        val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
        val opt = options as StandardJavadocDocletOptions
-        opt.links("https://jd.papermc.io/paper/1.20/")
+        opt.links("https://jd.papermc.io/paper/1.20.4/")
        opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
        opt.links("https://intellectualsites.github.io/plotsquared-javadocs/core/")
        opt.links("https://jd.advntr.dev/api/" + libs.adventureApi.get().versionConstraint.toString())
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
@ -789,22 +789,23 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                    if (entity.getMetadata("ps_custom_spawned").stream().anyMatch(MetadataValue::asBoolean)) {
                        continue;
                    }
+                    // TODO: use (type) pattern matching when targeting java 21
                    switch (entity.getType().toString()) {
                        case "EGG":
-                        case "FISHING_HOOK":
-                        case "ENDER_SIGNAL":
+                        case "FISHING_HOOK", "FISHING_BOBBER":
+                        case "ENDER_SIGNAL", "EYE_OF_ENDER":
                        case "AREA_EFFECT_CLOUD":
                        case "EXPERIENCE_ORB":
-                        case "LEASH_HITCH":
-                        case "FIREWORK":
-                        case "LIGHTNING":
+                        case "LEASH_HITCH", "LEASH_KNOT":
+                        case "FIREWORK", "FIREWORK_ROCKET":
+                        case "LIGHTNING", "LIGHTNING_BOLT":
                        case "WITHER_SKULL":
                        case "UNKNOWN":
                        case "PLAYER":
                            // non moving / unmovable
                            continue;
-                        case "THROWN_EXP_BOTTLE":
-                        case "SPLASH_POTION":
+                        case "THROWN_EXP_BOTTLE", "EXPERIENCE_BOTTLE":
+                        case "SPLASH_POTION", "POTION":
                        case "SNOWBALL":
                        case "SHULKER_BULLET":
                        case "SPECTRAL_ARROW":
@ -836,6 +837,11 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                        case "TNT_MINECART":
                        case "CHEST_BOAT":
                        case "BOAT":
+                        case "ACACIA_BOAT", "BIRCH_BOAT", "CHERRY_BOAT", "DARK_OAK_BOAT", "JUNGLE_BOAT", "MANGROVE_BOAT",
+                             "OAK_BOAT", "PALE_OAK_BOAT", "SPRUCE_BOAT", "BAMBOO_RAFT":
+                        case "ACACIA_CHEST_BOAT", "BIRCH_CHEST_BOAT", "CHERRY_CHEST_BOAT", "DARK_OAK_CHEST_BOAT",
+                             "JUNGLE_CHEST_BOAT", "MANGROVE_CHEST_BOAT", "OAK_CHEST_BOAT", "PALE_OAK_CHEST_BOAT",
+                             "SPRUCE_CHEST_BOAT", "BAMBOO_CHEST_RAFT":
                            if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
                                com.plotsquared.core.location.Location location = BukkitUtil.adapt(entity.getLocation());
                                Plot plot = location.getPlot();
@ -864,14 +870,14 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                        case "SMALL_FIREBALL":
                        case "FIREBALL":
                        case "DRAGON_FIREBALL":
-                        case "DROPPED_ITEM":
+                        case "DROPPED_ITEM", "ITEM":
                            if (Settings.Enabled_Components.KILL_ROAD_ITEMS
                                    && plotArea.getOwnedPlotAbs(BukkitUtil.adapt(entity.getLocation())) == null) {
                                this.removeRoadEntity(entity, iterator);
                            }
                            // dropped item
                            continue;
-                        case "PRIMED_TNT":
+                        case "PRIMED_TNT", "TNT":
                        case "FALLING_BLOCK":
                            // managed elsewhere
                            continue;
@ -949,7 +955,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                        case "HORSE":
                        case "IRON_GOLEM":
                        case "MAGMA_CUBE":
-                        case "MUSHROOM_COW":
+                        case "MUSHROOM_COW", "MOOSHROOM":
                        case "OCELOT":
                        case "PIG":
                        case "PIG_ZOMBIE":
@ -958,7 +964,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                        case "SILVERFISH":
                        case "SKELETON":
                        case "SLIME":
-                        case "SNOWMAN":
+                        case "SNOWMAN", "SNOW_GOLEM":
                        case "SPIDER":
                        case "SQUID":
                        case "VILLAGER":
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java
@ -25,7 +25,6 @@ import org.bukkit.Art;
 import org.bukkit.DyeColor;
 import org.bukkit.Location;
 import org.bukkit.Rotation;
-import org.bukkit.TreeSpecies;
 import org.bukkit.World;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.AbstractHorse;
@ -34,6 +33,7 @@ import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Bat;
 import org.bukkit.entity.Boat;
 import org.bukkit.entity.Breedable;
+import org.bukkit.entity.ChestBoat;
 import org.bukkit.entity.ChestedHorse;
 import org.bukkit.entity.EnderDragon;
 import org.bukkit.entity.Entity;
@ -44,7 +44,6 @@ import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Painting;
 import org.bukkit.entity.Rabbit;
 import org.bukkit.entity.Sheep;
-import org.bukkit.entity.Slime;
 import org.bukkit.entity.Tameable;
 import org.bukkit.inventory.EntityEquipment;
 import org.bukkit.inventory.InventoryHolder;
@ -103,11 +102,19 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
            this.noGravity = true;
        }
        switch (entity.getType().toString()) {
-            case "BOAT" -> {
+            case "BOAT", "ACACIA_BOAT", "BIRCH_BOAT", "CHERRY_BOAT", "DARK_OAK_BOAT", "JUNGLE_BOAT", "MANGROVE_BOAT",
+                 "OAK_BOAT", "PALE_OAK_BOAT", "SPRUCE_BOAT", "BAMBOO_RAFT" -> {
                Boat boat = (Boat) entity;
-                this.dataByte = getOrdinal(TreeSpecies.values(), boat.getWoodType());
+                this.dataByte = getOrdinal(Boat.Type.values(), boat.getBoatType());
                return;
            }
+            case "ACACIA_CHEST_BOAT", "BIRCH_CHEST_BOAT", "CHERRY_CHEST_BOAT", "DARK_OAK_CHEST_BOAT",
+                 "JUNGLE_CHEST_BOAT", "MANGROVE_CHEST_BOAT", "OAK_CHEST_BOAT", "PALE_OAK_CHEST_BOAT",
+                 "SPRUCE_CHEST_BOAT", "BAMBOO_CHEST_RAFT" -> {
+                ChestBoat boat = (ChestBoat) entity;
+                this.dataByte = getOrdinal(Boat.Type.values(), boat.getBoatType());
+                storeInventory(boat);
+            }
            case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "EXPERIENCE_ORB", "FALLING_BLOCK", "FIREBALL",
                    "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND", "MINECART_MOB_SPAWNER",
                    "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SLIME", "SMALL_FIREBALL", "SNOWBALL", "MINECART_FURNACE", "SPLASH_POTION",
@ -117,7 +124,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                return;
            }
            // MISC //
-            case "DROPPED_ITEM" -> {
+            case "DROPPED_ITEM", "ITEM" -> {
                Item item = (Item) entity;
                this.stack = item.getItemStack();
                return;
@ -147,14 +154,14 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
            }
            // END MISC //
            // INVENTORY HOLDER //
-            case "MINECART_CHEST", "MINECART_HOPPER" -> {
+            case "MINECART_CHEST", "CHEST_MINECART", "MINECART_HOPPER", "HOPPER_MINECART" -> {
                storeInventory((InventoryHolder) entity);
                return;
            }
            // START LIVING ENTITY //
            // START AGEABLE //
            // START TAMEABLE //
-            case "HORSE", "DONKEY", "LLAMA", "MULE", "SKELETON_HORSE" -> {
+            case "CAMEL", "HORSE", "DONKEY", "LLAMA", "TRADER_LLAMA", "MULE", "SKELETON_HORSE", "ZOMBIE_HORSE" -> {
                AbstractHorse horse = (AbstractHorse) entity;
                this.horse = new HorseStats();
                this.horse.jump = horse.getJumpStrength();
@ -172,14 +179,13 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                return;
            }
            // END INVENTORY HOLDER //
-            case "WOLF", "OCELOT" -> {
+            case "WOLF", "OCELOT", "CAT", "PARROT" -> {
                storeTameable((Tameable) entity);
                storeBreedable((Breedable) entity);
                storeLiving((LivingEntity) entity);
                return;
            }
            // END TAMEABLE //
-            //todo fix sheep
            case "SHEEP" -> {
                Sheep sheep = (Sheep) entity;
                if (sheep.isSheared()) {
@ -187,7 +193,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                } else {
                    this.dataByte = (byte) 0;
                }
-                this.dataByte2 = sheep.getColor().getDyeData();
+                this.dataByte2 = getOrdinal(DyeColor.values(), sheep.getColor());
                storeBreedable(sheep);
                storeLiving(sheep);
                return;
@ -268,7 +274,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
            }
            case "SKELETON", "WITHER_SKELETON", "GUARDIAN", "ELDER_GUARDIAN", "GHAST", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN",
                    "ZOMBIFIED_PIGLIN", "PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH",
-                    "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SHULKER", "SNOWMAN" -> {
+                    "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SHULKER", "SNOWMAN", "SNOW_GOLEM" -> {
                storeLiving((LivingEntity) entity);
                return;
            }
@ -450,7 +456,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
        }
        Entity entity;
        switch (this.getType().toString()) {
-            case "DROPPED_ITEM" -> {
+            case "DROPPED_ITEM", "ITEM" -> {
                return world.dropItem(location, this.stack);
            }
            case "PLAYER", "LEASH_HITCH" -> {
@ -486,15 +492,25 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
            entity.setGravity(false);
        }
        switch (entity.getType().toString()) {
-            case "BOAT" -> {
+            case "BOAT", "ACACIA_BOAT", "BIRCH_BOAT", "CHERRY_BOAT", "DARK_OAK_BOAT", "JUNGLE_BOAT", "MANGROVE_BOAT",
+                 "OAK_BOAT", "PALE_OAK_BOAT", "SPRUCE_BOAT", "BAMBOO_RAFT" -> {
                Boat boat = (Boat) entity;
-                boat.setWoodType(TreeSpecies.values()[dataByte]);
+                boat.setBoatType(Boat.Type.values()[dataByte]);
                return entity;
            }
-            case "SLIME" -> {
+            case "ACACIA_CHEST_BOAT", "BIRCH_CHEST_BOAT", "CHERRY_CHEST_BOAT", "DARK_OAK_CHEST_BOAT",
+                 "JUNGLE_CHEST_BOAT", "MANGROVE_CHEST_BOAT", "OAK_CHEST_BOAT", "PALE_OAK_CHEST_BOAT",
+                 "SPRUCE_CHEST_BOAT", "BAMBOO_CHEST_RAFT" -> {
+                ChestBoat boat = (ChestBoat) entity;
+                boat.setBoatType(Boat.Type.values()[dataByte]);
+                restoreInventory(boat);
+                return entity;
+            }
+            // SLIME is not even stored
+            /* case "SLIME" -> {
                ((Slime) entity).setSize(this.dataByte);
                return entity;
-            }
+            } */
            case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "DROPPED_ITEM", "EXPERIENCE_ORB", "FALLING_BLOCK",
                    "FIREBALL", "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND",
                    "MINECART_MOB_SPAWNER", "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SMALL_FIREBALL", "SNOWBALL",
@ -518,14 +534,14 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
            }
            // END MISC //
            // INVENTORY HOLDER //
-            case "MINECART_CHEST", "MINECART_HOPPER" -> {
+            case "MINECART_CHEST", "CHEST_MINECART", "MINECART_HOPPER", "HOPPER_MINECART" -> {
                restoreInventory((InventoryHolder) entity);
                return entity;
            }
            // START LIVING ENTITY //
            // START AGEABLE //
            // START TAMEABLE //
-            case "HORSE", "LLAMA", "SKELETON_HORSE", "DONKEY", "MULE" -> {
+            case "CAMEL", "HORSE", "DONKEY", "LLAMA", "TRADER_LLAMA", "MULE", "SKELETON_HORSE", "ZOMBIE_HORSE" -> {
                AbstractHorse horse = (AbstractHorse) entity;
                horse.setJumpStrength(this.horse.jump);
                if (horse instanceof ChestedHorse) {
@ -542,7 +558,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                return entity;
            }
            // END INVENTORY HOLDER //
-            case "WOLF", "OCELOT" -> {
+            case "WOLF", "OCELOT", "CAT", "PARROT" -> {
                restoreTameable((Tameable) entity);
                restoreBreedable((Breedable) entity);
                restoreLiving((LivingEntity) entity);
@ -555,7 +571,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                    sheep.setSheared(true);
                }
                if (this.dataByte2 != 0) {
-                    sheep.setColor(DyeColor.getByDyeData(this.dataByte2));
+                    sheep.setColor(DyeColor.values()[this.dataByte2]);
                }
                restoreBreedable(sheep);
                restoreLiving(sheep);
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java
@ -134,7 +134,7 @@ public class BlockEventListener117 implements Listener {
    public void onBlockFertilize(BlockFertilizeEvent event) {
        Block block = event.getBlock();
        List<org.bukkit.block.BlockState> blocks = event.getBlocks();
-        Location location = BukkitUtil.adapt(blocks.get(0).getLocation());
+        Location location = BukkitUtil.adapt(block.getLocation());

        PlotArea area = location.getPlotArea();
        if (area == null) {
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java
@ -42,6 +42,7 @@ import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.PlotFlagUtil;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.util.Enums;
 import com.sk89q.worldedit.world.block.BlockType;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Material;
@ -57,6 +58,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.entity.Vehicle;
+import org.bukkit.entity.minecart.ExplosiveMinecart;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@ -78,10 +80,17 @@ import org.checkerframework.checker.nullness.qual.NonNull;

 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;

@SuppressWarnings("unused")
 public class EntityEventListener implements Listener {

+    private static final Particle EXPLOSION_HUGE = Objects.requireNonNull(Enums.findByValue(
+            Particle.class,
+            "EXPLOSION_EMITTER",
+            "EXPLOSION_HUGE"
+    ));
+
    private final BukkitPlatform platform;
    private final PlotAreaManager plotAreaManager;
    private final EventDispatcher eventDispatcher;
@ -152,8 +161,8 @@ public class EntityEventListener implements Listener {
                }
            }
            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL",
-                    "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN", "NETHER_PORTAL",
-                    "FROZEN", "SPELL", "DEFAULT" -> {
+                 "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN", "NETHER_PORTAL",
+                 "FROZEN", "SPELL", "DEFAULT" -> {
                if (!area.isMobSpawning()) {
                    event.setCancelled(true);
                    return;
@ -314,7 +323,7 @@ public class EntityEventListener implements Listener {
                if (this.lastRadius != 0) {
                    List<Entity> nearby = event.getEntity().getNearbyEntities(this.lastRadius, this.lastRadius, this.lastRadius);
                    for (Entity near : nearby) {
-                        if (near instanceof TNTPrimed || near.getType().equals(EntityType.MINECART_TNT)) {
+                        if (near instanceof TNTPrimed || near instanceof ExplosiveMinecart) {
                            if (!near.hasMetadata("plot")) {
                                near.setMetadata("plot", new FixedMetadataValue((Plugin) PlotSquared.platform(), plot));
                            }
@ -338,7 +347,7 @@ public class EntityEventListener implements Listener {
        event.setCancelled(true);
        //Spawn Explosion Particles when enabled in settings
        if (Settings.General.ALWAYS_SHOW_EXPLOSIONS) {
-            event.getLocation().getWorld().spawnParticle(Particle.EXPLOSION_HUGE, event.getLocation(), 0);
+            event.getLocation().getWorld().spawnParticle(EXPLOSION_HUGE, event.getLocation(), 0);
        }
    }

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java
@ -31,8 +31,10 @@ import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.ArmorStand;
+import org.bukkit.entity.EnderCrystal;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Item;
 import org.bukkit.entity.Vehicle;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@ -132,7 +134,7 @@ public class EntitySpawnListener implements Listener {
        Plot plot = location.getOwnedPlotAbs();
        EntityType type = entity.getType();
        if (plot == null) {
-            if (type == EntityType.DROPPED_ITEM) {
+            if (entity instanceof Item) {
                if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
                    event.setCancelled(true);
                }
@ -154,7 +156,7 @@ public class EntitySpawnListener implements Listener {
        if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
            event.setCancelled(true);
        }
-        if (type == EntityType.ENDER_CRYSTAL || type == EntityType.ARMOR_STAND) {
+        if (entity instanceof EnderCrystal || type == EntityType.ARMOR_STAND) {
            if (BukkitEntityUtil.checkEntity(entity, plot)) {
                event.setCancelled(true);
            }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java
@ -52,6 +52,7 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.Chunk;
+import org.bukkit.NamespacedKey;
 import org.bukkit.block.Block;
 import org.bukkit.block.TileState;
 import org.bukkit.entity.Entity;
@ -80,6 +81,9 @@ import java.util.regex.Pattern;
@SuppressWarnings("unused")
 public class PaperListener implements Listener {

+    private static final NamespacedKey ITEM = NamespacedKey.minecraft("item");
+    private static final NamespacedKey FISHING_BOBBER = NamespacedKey.minecraft("fishing_bobber");
+
    private final PlotAreaManager plotAreaManager;
    private Chunk lastChunk;

@ -228,7 +232,7 @@ public class PaperListener implements Listener {
        if (plot == null) {
            EntityType type = event.getType();
            // PreCreatureSpawnEvent **should** not be called for DROPPED_ITEM, just for the sake of consistency
-            if (type == EntityType.DROPPED_ITEM) {
+            if (type.getKey().equals(ITEM)) {
                if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
                    event.setCancelled(true);
                }
@ -354,7 +358,7 @@ public class PaperListener implements Listener {
                event.setCancelled(true);
            }
        } else if (!plot.isAdded(pp.getUUID())) {
-            if (entity.getType().equals(EntityType.FISHING_HOOK)) {
+            if (entity.getType().getKey().equals(FISHING_BOBBER)) {
                if (plot.getFlag(FishingFlag.class)) {
                    return;
                }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
@ -376,7 +376,7 @@ public class PlayerEventListener implements Listener {

    @EventHandler
    public void onVehicleEntityCollision(VehicleEntityCollisionEvent e) {
-        if (e.getVehicle().getType() == EntityType.BOAT) {
+        if (e.getVehicle() instanceof Boat) {
            Location location = BukkitUtil.adapt(e.getEntity().getLocation());
            if (location.isPlotArea()) {
                if (e.getEntity() instanceof Player) {
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java
@ -35,7 +35,7 @@ import com.plotsquared.core.util.PlotFlagUtil;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
+import org.bukkit.entity.FishHook;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
@ -134,7 +134,7 @@ public class ProjectileEventListener implements Listener {
                event.setCancelled(true);
            }
        } else if (!plot.isAdded(pp.getUUID())) {
-            if (entity.getType().equals(EntityType.FISHING_HOOK)) {
+            if (entity instanceof FishHook) {
                if (plot.getFlag(FishingFlag.class)) {
                    return;
                }
@ -194,7 +194,7 @@ public class ProjectileEventListener implements Listener {
                return;
            }
            if (plot.isAdded(pp.getUUID()) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER) || plot.getFlag(
-                    ProjectilesFlag.class) || (entity.getType().equals(EntityType.FISHING_HOOK) && plot.getFlag(
+                    ProjectilesFlag.class) || (entity instanceof FishHook && plot.getFlag(
                    FishingFlag.class))) {
                return;
            }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitChunkCoordinator.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitChunkCoordinator.java
@ -30,6 +30,8 @@ import com.plotsquared.core.util.task.TaskTime;
 import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.world.World;
 import io.papermc.lib.PaperLib;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.plugin.Plugin;
@ -41,6 +43,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;

@ -55,6 +59,8 @@ import java.util.function.Consumer;
 **/
 public final class BukkitChunkCoordinator extends ChunkCoordinator {

+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BukkitChunkCoordinator.class.getSimpleName());
+
    private final List<ProgressSubscriber> progressSubscribers = new LinkedList<>();

    private final Queue<BlockVector2> requestedChunks;
@ -70,6 +76,7 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
    private final AtomicInteger expectedSize;
    private final AtomicInteger loadingChunks = new AtomicInteger();
    private final boolean forceSync;
+    private final boolean shouldGen;

    private int batchSize;
    private PlotSquaredTask task;
@ -87,7 +94,8 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
            @Assisted final @NonNull Consumer<Throwable> throwableConsumer,
            @Assisted("unloadAfter") final boolean unloadAfter,
            @Assisted final @NonNull Collection<ProgressSubscriber> progressSubscribers,
-            @Assisted("forceSync") final boolean forceSync
+            @Assisted("forceSync") final boolean forceSync,
+            @Assisted("shouldGen") final boolean shouldGen
    ) {
        this.requestedChunks = new LinkedBlockingQueue<>(requestedChunks);
        this.availableChunks = new LinkedBlockingQueue<>();
@ -103,6 +111,7 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
        this.bukkitWorld = Bukkit.getWorld(world.getName());
        this.progressSubscribers.addAll(progressSubscribers);
        this.forceSync = forceSync;
+        this.shouldGen = shouldGen;
    }

    @Override
@ -212,18 +221,28 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
     * Requests a batch of chunks to be loaded
     */
    private void requestBatch() {
-        BlockVector2 chunk;
-        for (int i = 0; i < this.batchSize && (chunk = this.requestedChunks.poll()) != null; i++) {
+        for (int i = 0; i < this.batchSize && this.requestedChunks.peek() != null; i++) {
            // This required PaperLib to be bumped to version 1.0.4 to mark the request as urgent
+            final BlockVector2 chunk = this.requestedChunks.poll();
            loadingChunks.incrementAndGet();
            PaperLib
-                    .getChunkAtAsync(this.bukkitWorld, chunk.getX(), chunk.getZ(), true, true)
+                    .getChunkAtAsync(this.bukkitWorld, chunk.getX(), chunk.getZ(), shouldGen, true)
+                    .orTimeout(10L, TimeUnit.SECONDS)
                    .whenComplete((chunkObject, throwable) -> {
                        loadingChunks.decrementAndGet();
                        if (throwable != null) {
-                            throwable.printStackTrace();
-                            // We want one less because this couldn't be processed
-                            this.expectedSize.decrementAndGet();
+                            if (throwable instanceof TimeoutException) {
+                                LOGGER.warn("Timed out awaiting chunk load {}", chunk);
+                                this.requestedChunks.offer(chunk);
+                            } else {
+                                LOGGER.error("Failed to load chunk {}", chunk, throwable);
+                                // We want one less because this couldn't be processed
+                                this.expectedSize.decrementAndGet();
+                            }
+                        } else if (chunkObject == null) {
+                            if (shouldGen) {
+                                LOGGER.error("Null chunk returned for chunk at {}", chunk);
+                            }
                        } else if (PlotSquared.get().isMainThread(Thread.currentThread())) {
                            this.processChunk(chunkObject);
                        } else {
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java
@ -238,6 +238,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
                        .unloadAfter(isUnloadAfter())
                        .withProgressSubscribers(getProgressSubscribers())
                        .forceSync(isForceSync())
+                        .shouldGen(isShouldGen())
                        .build();
        return super.enqueue();
    }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEntityUtil.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEntityUtil.java
@ -49,6 +49,7 @@ import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Creature;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Firework;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.event.entity.EntityDamageEvent;
@ -341,8 +342,7 @@ public class BukkitEntityUtil {
        }
        //disable the firework damage. too much of a headache to support at the moment.
        if (vplot != null) {
-            if (EntityDamageEvent.DamageCause.ENTITY_EXPLOSION == cause
-                    && damager.getType() == EntityType.FIREWORK) {
+            if (EntityDamageEvent.DamageCause.ENTITY_EXPLOSION == cause && damager instanceof Firework) {
                return false;
            }
        }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
@ -262,6 +262,11 @@ public class BukkitUtil extends WorldUtil {
        });
    }

+    @Override
+    public boolean isSmallBlock(Location location) {
+        return adapt(location).getBlock().getBoundingBox().getHeight() < 0.25;
+    }
+
    @Override
    @NonNegative
    public int getHighestBlockSynchronous(final @NonNull String world, final int x, final int z) {
--- a/Core/src/main/java/com/plotsquared/core/command/Remove.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Remove.java
@ -117,8 +117,8 @@ public class Remove extends SubCommand {
            }
            if (count == 0) {
                player.sendMessage(
-                        TranslatableCaption.of("errors.invalid_player"),
-                        TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
+                        TranslatableCaption.of("member.player_not_removed"),
+                        TagResolver.resolver("player", Tag.inserting(Component.text(args[0])))
                );
            } else {
                player.sendMessage(
--- a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java
@ -582,6 +582,8 @@ public class Settings extends Config {
        public static boolean PER_WORLD_VISIT = false;
        @Comment("Search merged plots for having multiple owners when using the visit command")
        public static boolean VISIT_MERGED_OWNERS = true;
+        @Comment("Allows to teleport based on block size instead to spawn on the highest block at the home command")
+        public static boolean SIZED_BASED = true;

    }

--- a/Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
+++ b/Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
@ -432,6 +432,7 @@ public class HybridUtils {
                if (!UPDATE) {
                    Iterator<BlockVector2> iter = chunks.iterator();
                    QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName()));
+                    queue.setShouldGen(false);
                    while (iter.hasNext()) {
                        BlockVector2 chunk = iter.next();
                        iter.remove();
@ -474,6 +475,7 @@ public class HybridUtils {
                                    Iterator<BlockVector2> iterator = chunks.iterator();
                                    if (chunks.size() >= 32) {
                                        QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName()));
+                                        queue.setShouldGen(false);
                                        for (int i = 0; i < 32; i++) {
                                            final BlockVector2 chunk = iterator.next();
                                            iterator.remove();
@ -487,6 +489,7 @@ public class HybridUtils {
                                        return null;
                                    }
                                    QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName()));
+                                    queue.setShouldGen(false);
                                    while (!chunks.isEmpty()) {
                                        final BlockVector2 chunk = iterator.next();
                                        iterator.remove();
@ -502,7 +505,6 @@ public class HybridUtils {
                                return;
                            }
                        } catch (Exception e) {
-                            e.printStackTrace();
                            Iterator<BlockVector2> iterator = HybridUtils.regions.iterator();
                            BlockVector2 loc = iterator.next();
                            iterator.remove();
@ -510,7 +512,8 @@ public class HybridUtils {
                                    "Error! Could not update '{}/region/r.{}.{}.mca' (Corrupt chunk?)",
                                    area.getWorldHash(),
                                    loc.getX(),
-                                    loc.getZ()
+                                    loc.getZ(),
+                                    e
                            );
                        }
                        TaskManager.runTaskLater(task, TaskTime.seconds(1L));
@ -558,7 +561,7 @@ public class HybridUtils {
                                try {
                                    plotworld.setupSchematics();
                                } catch (SchematicHandler.UnsupportedFormatException e) {
-                                    e.printStackTrace();
+                                    LOGGER.error(e);
                                }
                            });
                });
--- a/Core/src/main/java/com/plotsquared/core/inject/factory/ChunkCoordinatorFactory.java
+++ b/Core/src/main/java/com/plotsquared/core/inject/factory/ChunkCoordinatorFactory.java
@ -40,7 +40,8 @@ public interface ChunkCoordinatorFactory {
            final @NonNull Consumer<Throwable> throwableConsumer,
            @Assisted("unloadAfter") final boolean unloadAfter,
            final @NonNull Collection<ProgressSubscriber> progressSubscribers,
-            @Assisted("forceSync") final boolean forceSync
+            @Assisted("forceSync") final boolean forceSync,
+            @Assisted("shouldGen") final boolean shouldGen
    );

 }
--- a/Core/src/main/java/com/plotsquared/core/plot/Plot.java
+++ b/Core/src/main/java/com/plotsquared/core/plot/Plot.java
@ -1407,6 +1407,9 @@ public class Plot {
                );
            }
            Location location = toHomeLocation(bottom, home);
+            if (Settings.Teleport.SIZED_BASED && this.worldUtil.isSmallBlock(location) && this.worldUtil.isSmallBlock(location.add(0,1,0))) {
+                return location;
+            }
            if (!this.worldUtil.getBlockSynchronous(location).getBlockType().getMaterial().isAir()) {
                location = location.withY(
                        Math.max(1 + this.worldUtil.getHighestBlockSynchronous(
@ -1440,15 +1443,21 @@ public class Plot {
            }
            Location bottom = this.getBottomAbs();
            Location location = toHomeLocation(bottom, home);
-            this.worldUtil.getBlock(location, block -> {
-                if (!block.getBlockType().getMaterial().isAir()) {
-                    this.worldUtil.getHighestBlock(this.getWorldName(), location.getX(), location.getZ(),
-                            y -> result.accept(location.withY(Math.max(1 + y, bottom.getY())))
-                    );
-                } else {
-                    result.accept(location);
-                }
-            });
+            if (Settings.Teleport.SIZED_BASED && this.worldUtil.isSmallBlock(location) && this.worldUtil.isSmallBlock(location.add(0,1,0))) {
+                result.accept(location);
+            } else {
+                this.worldUtil.getBlock(location, block -> {
+
+                    if (!block.getBlockType().getMaterial().isAir()) {
+                        this.worldUtil.getHighestBlock(this.getWorldName(), location.getX(), location.getZ(),
+                                y -> result.accept(location.withY(Math.max(1 + y, bottom.getY())))
+                        );
+                    } else {
+                        result.accept(location);
+                    }
+                });
+            }
+
        }
    }

--- a/Core/src/main/java/com/plotsquared/core/queue/ChunkCoordinatorBuilder.java
+++ b/Core/src/main/java/com/plotsquared/core/queue/ChunkCoordinatorBuilder.java
@ -52,6 +52,7 @@ public class ChunkCoordinatorBuilder {
    private int initialBatchSize = Settings.QUEUE.INITIAL_BATCH_SIZE;
    private boolean unloadAfter = true;
    private boolean forceSync = false;
+    private boolean shouldGen = true;

    @Inject
    public ChunkCoordinatorBuilder(@NonNull ChunkCoordinatorFactory chunkCoordinatorFactory) {
@ -203,6 +204,19 @@ public class ChunkCoordinatorBuilder {
        return this;
    }

+    /**
+     * Set whether chunks should be generated as part of this operation. Default is true. Disabling this may not be supported
+     * depending on server implementation. (i.e. setting to false may not actually disable generation as part of this operation
+     * - this is just a catch-all in case of future differing server implementations; the option will work on Spigot/Paper).
+     *
+     * @param shouldGen should generate new chunks or not
+     * @since 7.5.0
+     */
+    public @NonNull ChunkCoordinatorBuilder shouldGen(final boolean shouldGen) {
+        this.shouldGen = shouldGen;
+        return this;
+    }
+
    public @NonNull ChunkCoordinatorBuilder withProgressSubscriber(ProgressSubscriber progressSubscriber) {
        this.progressSubscribers.add(progressSubscriber);
        return this;
@ -234,7 +248,8 @@ public class ChunkCoordinatorBuilder {
                        this.throwableConsumer,
                        this.unloadAfter,
                        this.progressSubscribers,
-                        this.forceSync
+                        this.forceSync,
+                        this.shouldGen
                );
    }

--- a/Core/src/main/java/com/plotsquared/core/queue/DelegateQueueCoordinator.java
+++ b/Core/src/main/java/com/plotsquared/core/queue/DelegateQueueCoordinator.java
@ -51,6 +51,7 @@ public class DelegateQueueCoordinator extends QueueCoordinator {

        if (parent != null) {
            this.setForceSync(parent.isForceSync());
+            this.setShouldGen(parent.isShouldGen());
        }
    }

--- a/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java
+++ b/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java
@ -45,6 +45,7 @@ public abstract class QueueCoordinator {

    private final AtomicBoolean enqueued = new AtomicBoolean();
    private boolean forceSync = false;
+    private boolean shouldGen = true;
    @Nullable
    private Object chunkObject;
    @SuppressWarnings({"unused", "FieldCanBeLocal"})
@ -110,6 +111,30 @@ public abstract class QueueCoordinator {
        this.forceSync = forceSync;
    }

+
+    /**
+     * Get whether chunks should be generated as part of this operation. Default is true. Disabling this may not be supported
+     * depending on server implementation. (i.e. setting to false may not actually disable generation as part of this operation
+     * - this is just a catch-all in case of future differing server implementations; the option will work on Spigot/Paper).
+     *
+     * @since 7.5.0
+     */
+    public boolean isShouldGen() {
+        return shouldGen;
+    }
+
+    /**
+     * Set whether chunks should be generated as part of this operation. Default is true. Disabling this may not be supported
+     * depending on server implementation. (i.e. setting to false may not actually disable generation as part of this operation
+     * - this is just a catch-all in case of future differing server implementations; the option will work on Spigot/Paper).
+     *
+     * @param shouldGen should generate new chunks or not
+     * @since 7.5.0
+     */
+    public void setShouldGen(boolean shouldGen) {
+        this.shouldGen = shouldGen;
+    }
+
    /**
     * Get the Chunk Object set to the queue
     *
--- a/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
+++ b/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
@ -177,6 +177,13 @@ public abstract class WorldUtil {
     */
    public abstract void getBlock(@NonNull Location location, @NonNull Consumer<BlockState> result);

+    /**
+     * Checks if the block smaller as a slab
+     * @param location Block location
+     * @return true if it smaller as a slab
+     */
+    public abstract boolean isSmallBlock(@NonNull Location location);
+
    /**
     * Get the block at a given location (synchronously)
     *
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -22,7 +22,7 @@ plugins {
 }

 group = "com.intellectualsites.plotsquared"
-version = "7.4.2"
+version = "7.5.2-SNAPSHOT"

 if (!File("$rootDir/.git").exists()) {
    logger.lifecycle("""
@ -79,8 +79,8 @@ subprojects {

    dependencies {
        // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:5.11.4")
-        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.4")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.12.0")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.12.0")
    }

    plugins.withId("java") {
@ -230,7 +230,7 @@ tasks.getByName<Jar>("jar") {
    enabled = false
 }

-val supportedVersions = listOf("1.18.2", "1.19.4", "1.20.6", "1.21.1", "1.21.3")
+val supportedVersions = listOf("1.19.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4")
 tasks {
    register("cacheLatestFaweArtifact") {
        val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@ -7,13 +7,13 @@ checkerqual = "3.49.0"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
-adventure = "4.18.0"
+adventure = "4.19.0"
 adventure-bukkit = "4.3.4"
 log4j = "2.19.0"

 # Plugins
 worldedit = "7.2.20"
-fawe = "2.12.3"
+fawe = "2.13.0"
 placeholderapi = "2.11.6"
 luckperms = "5.4"
 essentialsx = "2.20.1"
Author	SHA1	Message	Date
SirYwell	9127e472b8	Fix IndexOutOfBoundsException on BlockFertilizeEvent	2025-02-24 16:59:23 +01:00
dordsor21	a0a3d8828a	Back to snapshot for development	2025-02-23 20:57:47 +00:00
dordsor21	8741bfcf88	Release 7.5.1	2025-02-23 20:46:30 +00:00
dordsor21	6a6c113e5b	fix: use orTimeout instead of completing null in chunk coordinator	2025-02-23 20:25:17 +00:00
renovate[bot]	3f573b4d46	Update fawe to v2.13.0 (#4607 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-02-23 14:35:55 +00:00
Alexander Brandes	2f6db9c3db	Back to snapshot for development Signed-off-by: Alexander Brandes <mc.cache@web.de>	2025-02-23 11:27:30 +01:00
Alexander Brandes	2f050b7b47	Release 7.5.0 Signed-off-by: Alexander Brandes <mc.cache@web.de>	2025-02-23 11:25:22 +01:00
Jordan	eb0d854870	fix: allow queues to not generate chunks (#4599 ) - initially apply to regenallroads - additionally add a 10s timeout for requesting a chunk before resubmitting it to the queue - addresses #4310	2025-02-23 11:21:18 +01:00
Pierre Maurice Schwang	d4f10422e3	1.21.4 (#4582 ) * chore: bump api to 1.21.4 * fix: replace (removed) constants with backwards compatible alternatives * chore: cleanup import * chore: update javadoc link for paper * chore: i like this more * fix: check for vehicle * chore: compile against 1.20.4 again * chore: add 1.21.4 to bug report issue template * chore: add 1.21.4 to runServer supported versions array * chore: update entity type enum name switch * chore: remove 1.18 from supportedVersions for runServer task * fix: attempt to update ReplicatingEntityWrapper * fix/chore: missing boat handling on spawn * chore: cleanup imports	2025-02-23 11:20:33 +01:00
TheJonstone✓	4e2ea67992	fix: update error message of `/p remove <player>` if player does not need to be removed (#4592 )	2025-02-22 19:25:49 +00:00
renovate[bot]	f533e194f4	Update junit5 monorepo (#4598 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-02-21 14:18:09 +00:00
renovate[bot]	98bc2e7407	Update adventure to v4.19.0 (#4597 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-02-17 03:18:04 +00:00
Phillipp Glanz	1b9d0d5317	Improve teleport behavior for home command (#4369 )	2025-02-15 15:29:21 +00:00
Alexander Brandes	8bb15d5c65	Back to snapshot for development Signed-off-by: Alexander Brandes <mc.cache@web.de>	2025-02-12 21:15:51 +01:00