chore: cleanup imports

fix/chore: missing boat handling on spawn
fix: attempt to update ReplicatingEntityWrapper
2025-07-13 10:54:43 +02:00 · 2025-02-21 20:59:37 +01:00 · 2025-02-21 20:28:53 +01:00 · 2025-02-21 20:22:22 +01:00 · 2025-02-19 22:17:04 +01:00 · 2025-02-19 22:13:09 +01:00
22 changed files with 164 additions and 113 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/.github/renovate.json
+++ b/.github/renovate.json
@ -1,7 +1,7 @@
 {
  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
  "extends": [
-    "config:base",
+    "config:recommended",
    ":semanticCommitsDisabled"
  ],
  "automerge": true,
--- a/.github/workflows/label-merge-conflicts.yaml
+++ b/.github/workflows/label-merge-conflicts.yaml
@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Label conflicting PRs
-        uses: eps1lon/actions-label-merge-conflict@v3.0.2
+        uses: eps1lon/actions-label-merge-conflict@v3.0.3
        with:
          dirtyLabel: "unresolved-merge-conflict"
          repoToken: "${{ secrets.GITHUB_TOKEN }}"
--- 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":
@ -1171,7 +1177,9 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
    @Override
    public @NonNull String serverNativePackage() {
        final String name = Bukkit.getServer().getClass().getPackage().getName();
-        return name.substring(name.lastIndexOf('.') + 1);
+        String ver = name.substring(name.lastIndexOf('.') + 1);
+        // org.bukkit.craftbukkit is no longer suffixed by a version
+        return ver.equals("craftbukkit") ? "" : ver;
    }

    @Override
--- 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/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;
@ -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
@ -47,10 +47,12 @@ import com.plotsquared.core.plot.flag.implementations.TileDropFlag;
 import com.plotsquared.core.plot.flag.types.BooleanFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.PlotFlagUtil;
+import io.papermc.paper.event.entity.EntityMoveEvent;
 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;
@ -58,6 +60,7 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Slime;
+import org.bukkit.event.Cancellable;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@ -78,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;

@ -104,33 +110,7 @@ public class PaperListener implements Listener {
        if (!Settings.Paper_Components.ENTITY_PATHING) {
            return;
        }
-        Location toLoc = BukkitUtil.adapt(event.getLoc());
-        Location fromLoc = BukkitUtil.adapt(event.getEntity().getLocation());
-        PlotArea tarea = toLoc.getPlotArea();
-        if (tarea == null) {
-            return;
-        }
-        PlotArea farea = fromLoc.getPlotArea();
-        if (farea == null) {
-            return;
-        }
-        if (tarea != farea) {
-            event.setCancelled(true);
-            return;
-        }
-        Plot tplot = toLoc.getPlot();
-        Plot fplot = fromLoc.getPlot();
-        if (tplot == null ^ fplot == null) {
-            event.setCancelled(true);
-            return;
-        }
-        if (tplot == null || tplot.getId().hashCode() == fplot.getId().hashCode()) {
-            return;
-        }
-        if (fplot.isMerged() && fplot.getConnectedPlots().contains(fplot)) {
-            return;
-        }
-        event.setCancelled(true);
+        handleEntityMovement(event, event.getEntity().getLocation(), event.getLoc());
    }

    @EventHandler
@ -145,8 +125,23 @@ public class PaperListener implements Listener {
            return;
        }

-        Location toLoc = BukkitUtil.adapt(b.getLocation());
-        Location fromLoc = BukkitUtil.adapt(event.getEntity().getLocation());
+        handleEntityMovement(event, event.getEntity().getLocation(),  b.getLocation());
+    }
+
+    @EventHandler
+    public void onEntityMove(EntityMoveEvent event) {
+        if (!Settings.Paper_Components.ENTITY_MOVEMENT) {
+            return;
+        }
+        if (!event.hasExplicitlyChangedBlock()) {
+            return;
+        }
+        handleEntityMovement(event, event.getFrom(), event.getTo());
+    }
+
+    private static void handleEntityMovement(Cancellable event, org.bukkit.Location from, org.bukkit.Location target) {
+        Location toLoc = BukkitUtil.adapt(target);
+        Location fromLoc = BukkitUtil.adapt(from);
        PlotArea tarea = toLoc.getPlotArea();
        if (tarea == null) {
            return;
@ -155,7 +150,6 @@ public class PaperListener implements Listener {
        if (farea == null) {
            return;
        }
-
        if (tarea != farea) {
            event.setCancelled(true);
            return;
@ -166,10 +160,10 @@ public class PaperListener implements Listener {
            event.setCancelled(true);
            return;
        }
-        if (tplot == null || tplot.getId().hashCode() == fplot.getId().hashCode()) {
+        if (tplot == null || tplot.getId().equals(fplot.getId())) {
            return;
        }
-        if (fplot.isMerged() && fplot.getConnectedPlots().contains(fplot)) {
+        if (fplot.isMerged() && fplot.getConnectedPlots().contains(tplot)) {
            return;
        }
        event.setCancelled(true);
@ -238,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);
                }
@ -364,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/listener/SingleWorldListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/SingleWorldListener.java
@ -49,9 +49,14 @@ public class SingleWorldListener implements Listener {
            this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle").getRealMethod();
        } catch (NoSuchMethodException ignored) {
            try {
-                ReflectionUtils.RefClass classChunkStatus = getRefClass("net.minecraft.world.level.chunk.ChunkStatus");
+                String chunkStatus = PlotSquared.platform().serverVersion()[1] < 21
+                        ? "net.minecraft.world.level.chunk" + ".ChunkStatus"
+                        : "net.minecraft.world.level.chunk.status.ChunkStatus";
+                ReflectionUtils.RefClass classChunkStatus = getRefClass(chunkStatus);
                this.objChunkStatusFull = classChunkStatus.getRealClass().getField("n").get(null);
-                this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle", classChunkStatus.getRealClass()).getRealMethod();
+                this.methodGetHandleChunk = classCraftChunk
+                        .getMethod("getHandle", classChunkStatus.getRealClass())
+                        .getRealMethod();
            } catch (NoSuchMethodException ex) {
                throw new RuntimeException(ex);
            }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java
@ -62,19 +62,28 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
    private static final SideEffectSet EDGE_LIGHTING_SIDE_EFFECT_SET;

    static {
-        NO_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.LIGHTING, SideEffect.State.OFF).with(
-                SideEffect.NEIGHBORS,
-                SideEffect.State.OFF
-        );
-        EDGE_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.UPDATE, SideEffect.State.ON).with(
-                SideEffect.NEIGHBORS,
-                SideEffect.State.ON
-        );
-        LIGHTING_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.NEIGHBORS, SideEffect.State.OFF);
-        EDGE_LIGHTING_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.UPDATE, SideEffect.State.ON).with(
-                SideEffect.NEIGHBORS,
-                SideEffect.State.ON
-        );
+        NO_SIDE_EFFECT_SET = enableNetworkIfNeeded()
+                .with(SideEffect.LIGHTING, SideEffect.State.OFF)
+                .with(SideEffect.NEIGHBORS, SideEffect.State.OFF);
+        EDGE_SIDE_EFFECT_SET = NO_SIDE_EFFECT_SET
+                .with(SideEffect.UPDATE, SideEffect.State.ON)
+                .with(SideEffect.NEIGHBORS, SideEffect.State.ON);
+        LIGHTING_SIDE_EFFECT_SET = NO_SIDE_EFFECT_SET
+                .with(SideEffect.NEIGHBORS, SideEffect.State.OFF);
+        EDGE_LIGHTING_SIDE_EFFECT_SET = NO_SIDE_EFFECT_SET
+                .with(SideEffect.UPDATE, SideEffect.State.ON)
+                .with(SideEffect.NEIGHBORS, SideEffect.State.ON);
+    }
+
+    // make sure block changes are sent
+    private static SideEffectSet enableNetworkIfNeeded() {
+        SideEffect network;
+        try {
+            network = SideEffect.valueOf("NETWORK");
+        } catch (IllegalArgumentException ignored) {
+            return SideEffectSet.none();
+        }
+        return SideEffectSet.none().with(network, SideEffect.State.ON);
    }

    private org.bukkit.World bukkitWorld;
--- 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/Core/src/main/java/com/plotsquared/core/PlotSquared.java
+++ b/Core/src/main/java/com/plotsquared/core/PlotSquared.java
@ -206,7 +206,8 @@ public class PlotSquared {
        GlobalFlagContainer.setup();

        try {
-            new ReflectionUtils(this.platform.serverNativePackage());
+            String ver = this.platform.serverNativePackage();
+            new ReflectionUtils(ver.isEmpty() ? null : ver);
            try {
                URL logurl = PlotSquared.class.getProtectionDomain().getCodeSource().getLocation();
                this.jarFile = new File(
@ -214,7 +215,7 @@ public class PlotSquared {
                                logurl.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file"))
                                .getPath());
            } catch (URISyntaxException | SecurityException e) {
-                e.printStackTrace();
+                LOGGER.error(e);
                this.jarFile = new File(this.platform.getDirectory().getParentFile(), "PlotSquared.jar");
                if (!this.jarFile.exists()) {
                    this.jarFile = new File(
@ -238,7 +239,7 @@ public class PlotSquared {
            copyFile("skyblock.template", Settings.Paths.TEMPLATES);
            showDebug();
        } catch (Throwable e) {
-            e.printStackTrace();
+            LOGGER.error(e);
        }
    }

--- a/Core/src/main/java/com/plotsquared/core/command/Music.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Music.java
@ -56,7 +56,8 @@ public class Music extends SubCommand {
            .asList("music_disc_13", "music_disc_cat", "music_disc_blocks", "music_disc_chirp",
                    "music_disc_far", "music_disc_mall", "music_disc_mellohi", "music_disc_stal",
                    "music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait", "music_disc_otherside",
-                    "music_disc_pigstep", "music_disc_5", "music_disc_relic"
+                    "music_disc_pigstep", "music_disc_5", "music_disc_relic", "music_disc_creator",
+                    "music_disc_creator_music_box", "music_disc_precipice"
            );

    private final InventoryUtil inventoryUtil;
--- a/Core/src/main/java/com/plotsquared/core/configuration/Config.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/Config.java
@ -26,6 +26,7 @@ import org.apache.logging.log4j.Logger;

 import java.io.File;
 import java.io.PrintWriter;
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@ -372,6 +373,7 @@ public class Config {
     */
    @Retention(RetentionPolicy.RUNTIME)
    @Target({ElementType.FIELD, ElementType.TYPE})
+    @Documented
    public @interface Comment {

        String[] value();
--- a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java
@ -651,6 +651,8 @@ public class Settings extends Config {
        public static boolean PAPER_LISTENERS = true;
        @Comment("Prevent entities from leaving plots")
        public static boolean ENTITY_PATHING = true;
+        @Comment("Prevent entities from leaving plots, even by pushing or pulling")
+        public static boolean ENTITY_MOVEMENT = false;
        @Comment(
                "Cancel entity spawns when the chunk is loaded if the PlotArea's mob spawning is off")
        public static boolean CANCEL_CHUNK_SPAWN = true;
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -22,7 +22,7 @@ plugins {
 }

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

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

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

    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
@ -2,18 +2,18 @@
 # Platform expectations
 paper = "1.20.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
-spotbugs = "4.8.6"
-checkerqual = "3.48.2"
+spotbugs = "4.9.0"
+checkerqual = "3.48.4"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
-adventure = "4.17.0"
+adventure = "4.18.0"
 adventure-bukkit = "4.3.4"
 log4j = "2.19.0"

 # Plugins
 worldedit = "7.2.20"
-fawe = "2.12.1"
+fawe = "2.12.3"
 placeholderapi = "2.11.6"
 luckperms = "5.4"
 essentialsx = "2.20.1"
@ -35,7 +35,7 @@ serverlib = "2.3.6"
 # Gradle plugins
 shadow = "8.3.5"
 grgit = "4.1.1"
-spotless = "6.25.0"
+spotless = "7.0.2"
 nexus = "2.0.0"
 runPaper = "2.3.1"

--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
--- a/3
+++ b/3
@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
Author	SHA1	Message	Date
Pierre Maurice Schwang	998f7b8732	chore: cleanup imports	2025-02-21 20:59:37 +01:00
Pierre Maurice Schwang	7453b2db45	fix/chore: missing boat handling on spawn	2025-02-21 20:28:53 +01:00
Pierre Maurice Schwang	a67b05c872	fix: attempt to update ReplicatingEntityWrapper	2025-02-21 20:22:22 +01:00
Pierre Maurice Schwang	c44a276765	chore: remove 1.18 from supportedVersions for runServer task	2025-02-19 22:17:04 +01:00
Pierre Maurice Schwang	c2d9a0f778	chore: update entity type enum name switch	2025-02-19 22:13:09 +01:00
Pierre Maurice Schwang	55e9d17610	chore: add 1.21.4 to runServer supported versions array	2025-02-15 17:57:00 +01:00
Pierre Maurice Schwang	8512d1526d	chore: add 1.21.4 to bug report issue template	2025-02-15 17:55:29 +01:00
Pierre Maurice Schwang	4b656711d8	chore: compile against 1.20.4 again	2025-02-15 17:54:00 +01:00
Pierre Maurice Schwang	af7caa1f66	fix: check for vehicle	2025-02-13 20:48:50 +01:00
Pierre Maurice Schwang	2d736d8946	chore: i like this more	2025-01-26 13:29:58 +01:00
Pierre Maurice Schwang	e086d7a37c	chore: update javadoc link for paper	2025-01-25 21:37:07 +01:00
Pierre Maurice Schwang	52fe75c746	chore: cleanup import	2025-01-25 21:36:25 +01:00
Pierre Maurice Schwang	bdb339905a	fix: replace (removed) constants with backwards compatible alternatives	2025-01-25 21:15:08 +01:00
Pierre Maurice Schwang	1192bf2b33	chore: bump api to 1.21.4	2025-01-25 21:14:26 +01:00
renovate[bot]	11b806bd4d	Update dependency gradle to v8.12.1 (#4581 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-24 14:14:20 +00:00
renovate[bot]	0275372051	Update dependency com.github.spotbugs:spotbugs-annotations to v4.9.0 (#4572 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-16 13:14:02 +00:00
renovate[bot]	c18cf3acfe	Update dependency com.diffplug.spotless to v7.0.2 (#4571 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-14 21:41:40 +00:00
renovate[bot]	fa52149394	Update dependency com.diffplug.spotless to v7.0.1 (#4566 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-07 20:31:41 +00:00
renovate[bot]	f5108ec253	Update dependency com.diffplug.spotless to v7 (#4565 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-07 09:10:19 +00:00
renovate[bot]	a7058eeff2	Update eps1lon/actions-label-merge-conflict action to v3.0.3 (#4564 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-07 08:01:24 +00:00
renovate[bot]	eabae8db44	Update dependency org.checkerframework:checker-qual to v3.48.4 (#4563 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-07 08:01:08 +00:00
Alexander Brandes	a836e8e763	Back to snapshot for development Signed-off-by: Alexander Brandes <mc.cache@web.de>	2024-12-30 21:07:08 +01:00
Alexander Brandes	6930a9cecb	Release 7.4.1 Signed-off-by: Alexander Brandes <mc.cache@web.de>	2024-12-30 21:03:23 +01:00
Hannes Greule	effbacb823	Force-enable NETWORK side effect to ensure blocks are instantly visible (#4558 )	2024-12-30 21:01:10 +01:00
renovate[bot]	47d1f1e0cb	Update fawe to v2.12.3 (#4561 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-12-29 13:17:37 +00:00
renovate[bot]	6bedd9b25f	Update adventure to v4.18.0 (#4559 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-12-23 00:23:50 +00:00
Hannes Greule	960b7b2a8b	Add option to prevent entities from being moved from plot (#4554 )	2024-12-22 11:12:10 +01:00
renovate[bot]	198052b7a8	Update dependency gradle to v8.12 (#4555 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-12-20 20:51:53 +00:00
renovate[bot]	a5af3a9d16	Update junit5 monorepo (#4553 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-12-16 15:52:35 +00:00
Jordan	bc4e2c51da	fix: update to changes in 1.21 class paths (#4546 )	2024-12-06 17:52:17 +01:00
Alexander Brandes	c46b4ddeaa	Add 1.21 music discs (Fixes #4551 ) Signed-off-by: Alexander Brandes <mc.cache@web.de>	2024-12-06 17:51:31 +01:00
renovate[bot]	c8e7367987	Update dependency org.checkerframework:checker-qual to v3.48.3 (#4549 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-12-02 20:52:26 +00:00
renovate[bot]	1a0450eefb	Migrate renovate config (#4543 ) Migrate config .github/renovate.json Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Pierre Maurice Schwang <mail@pschwang.eu>	2024-11-30 00:00:16 +01:00
renovate[bot]	0cb8075184	Update dependency com.fastasyncworldedit:FastAsyncWorldEdit-Core to v2.12.2 (#4547 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-11-25 05:11:54 +00:00