Add option to prevent entities from being moved from plot

2025-07-14 19:34:43 +02:00 · 2024-12-19 21:10:40 +01:00
16 changed files with 73 additions and 121 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -27,7 +27,6 @@ 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/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.3
+        uses: eps1lon/actions-label-merge-conflict@v3.0.2
        with:
          dirtyLabel: "unresolved-merge-conflict"
          repoToken: "${{ secrets.GITHUB_TOKEN }}"
--- a/Bukkit/build.gradle.kts
+++ b/Bukkit/build.gradle.kts
@ -39,9 +39,7 @@ dependencies {
    }
    compileOnly(libs.placeholderapi)
    compileOnly(libs.luckperms)
-    compileOnly(libs.essentialsx) {
-        exclude(group = "org.spigotmc")
-    }
+    compileOnly(libs.essentialsx)
    compileOnly(libs.mvdwapi) { isTransitive = false }

    // Other libraries
@ -103,7 +101,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.4/")
+        opt.links("https://jd.papermc.io/paper/1.20/")
        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,23 +789,22 @@ 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", "FISHING_BOBBER":
-                        case "ENDER_SIGNAL", "EYE_OF_ENDER":
+                        case "FISHING_HOOK":
+                        case "ENDER_SIGNAL":
                        case "AREA_EFFECT_CLOUD":
                        case "EXPERIENCE_ORB":
-                        case "LEASH_HITCH", "LEASH_KNOT":
-                        case "FIREWORK", "FIREWORK_ROCKET":
-                        case "LIGHTNING", "LIGHTNING_BOLT":
+                        case "LEASH_HITCH":
+                        case "FIREWORK":
+                        case "LIGHTNING":
                        case "WITHER_SKULL":
                        case "UNKNOWN":
                        case "PLAYER":
                            // non moving / unmovable
                            continue;
-                        case "THROWN_EXP_BOTTLE", "EXPERIENCE_BOTTLE":
-                        case "SPLASH_POTION", "POTION":
+                        case "THROWN_EXP_BOTTLE":
+                        case "SPLASH_POTION":
                        case "SNOWBALL":
                        case "SHULKER_BULLET":
                        case "SPECTRAL_ARROW":
@ -837,11 +836,6 @@ 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();
@ -870,14 +864,14 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                        case "SMALL_FIREBALL":
                        case "FIREBALL":
                        case "DRAGON_FIREBALL":
-                        case "DROPPED_ITEM", "ITEM":
+                        case "DROPPED_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", "TNT":
+                        case "PRIMED_TNT":
                        case "FALLING_BLOCK":
                            // managed elsewhere
                            continue;
@ -955,7 +949,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                        case "HORSE":
                        case "IRON_GOLEM":
                        case "MAGMA_CUBE":
-                        case "MUSHROOM_COW", "MOOSHROOM":
+                        case "MUSHROOM_COW":
                        case "OCELOT":
                        case "PIG":
                        case "PIG_ZOMBIE":
@ -964,7 +958,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                        case "SILVERFISH":
                        case "SKELETON":
                        case "SLIME":
-                        case "SNOWMAN", "SNOW_GOLEM":
+                        case "SNOWMAN":
                        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,6 +25,7 @@ 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;
@ -33,7 +34,6 @@ 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,6 +44,7 @@ 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;
@ -102,19 +103,11 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
            this.noGravity = true;
        }
        switch (entity.getType().toString()) {
-            case "BOAT", "ACACIA_BOAT", "BIRCH_BOAT", "CHERRY_BOAT", "DARK_OAK_BOAT", "JUNGLE_BOAT", "MANGROVE_BOAT",
-                 "OAK_BOAT", "PALE_OAK_BOAT", "SPRUCE_BOAT", "BAMBOO_RAFT" -> {
+            case "BOAT" -> {
                Boat boat = (Boat) entity;
-                this.dataByte = getOrdinal(Boat.Type.values(), boat.getBoatType());
+                this.dataByte = getOrdinal(TreeSpecies.values(), boat.getWoodType());
                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",
@ -124,7 +117,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                return;
            }
            // MISC //
-            case "DROPPED_ITEM", "ITEM" -> {
+            case "DROPPED_ITEM" -> {
                Item item = (Item) entity;
                this.stack = item.getItemStack();
                return;
@ -154,14 +147,14 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
            }
            // END MISC //
            // INVENTORY HOLDER //
-            case "MINECART_CHEST", "CHEST_MINECART", "MINECART_HOPPER", "HOPPER_MINECART" -> {
+            case "MINECART_CHEST", "MINECART_HOPPER" -> {
                storeInventory((InventoryHolder) entity);
                return;
            }
            // START LIVING ENTITY //
            // START AGEABLE //
            // START TAMEABLE //
-            case "CAMEL", "HORSE", "DONKEY", "LLAMA", "TRADER_LLAMA", "MULE", "SKELETON_HORSE", "ZOMBIE_HORSE" -> {
+            case "HORSE", "DONKEY", "LLAMA", "MULE", "SKELETON_HORSE" -> {
                AbstractHorse horse = (AbstractHorse) entity;
                this.horse = new HorseStats();
                this.horse.jump = horse.getJumpStrength();
@ -179,13 +172,14 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                return;
            }
            // END INVENTORY HOLDER //
-            case "WOLF", "OCELOT", "CAT", "PARROT" -> {
+            case "WOLF", "OCELOT" -> {
                storeTameable((Tameable) entity);
                storeBreedable((Breedable) entity);
                storeLiving((LivingEntity) entity);
                return;
            }
            // END TAMEABLE //
+            //todo fix sheep
            case "SHEEP" -> {
                Sheep sheep = (Sheep) entity;
                if (sheep.isSheared()) {
@ -193,7 +187,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                } else {
                    this.dataByte = (byte) 0;
                }
-                this.dataByte2 = getOrdinal(DyeColor.values(), sheep.getColor());
+                this.dataByte2 = sheep.getColor().getDyeData();
                storeBreedable(sheep);
                storeLiving(sheep);
                return;
@ -274,7 +268,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", "SNOW_GOLEM" -> {
+                    "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SHULKER", "SNOWMAN" -> {
                storeLiving((LivingEntity) entity);
                return;
            }
@ -456,7 +450,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
        }
        Entity entity;
        switch (this.getType().toString()) {
-            case "DROPPED_ITEM", "ITEM" -> {
+            case "DROPPED_ITEM" -> {
                return world.dropItem(location, this.stack);
            }
            case "PLAYER", "LEASH_HITCH" -> {
@ -492,25 +486,15 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
            entity.setGravity(false);
        }
        switch (entity.getType().toString()) {
-            case "BOAT", "ACACIA_BOAT", "BIRCH_BOAT", "CHERRY_BOAT", "DARK_OAK_BOAT", "JUNGLE_BOAT", "MANGROVE_BOAT",
-                 "OAK_BOAT", "PALE_OAK_BOAT", "SPRUCE_BOAT", "BAMBOO_RAFT" -> {
+            case "BOAT" -> {
                Boat boat = (Boat) entity;
-                boat.setBoatType(Boat.Type.values()[dataByte]);
+                boat.setWoodType(TreeSpecies.values()[dataByte]);
                return entity;
            }
-            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" -> {
+            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",
@ -534,14 +518,14 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
            }
            // END MISC //
            // INVENTORY HOLDER //
-            case "MINECART_CHEST", "CHEST_MINECART", "MINECART_HOPPER", "HOPPER_MINECART" -> {
+            case "MINECART_CHEST", "MINECART_HOPPER" -> {
                restoreInventory((InventoryHolder) entity);
                return entity;
            }
            // START LIVING ENTITY //
            // START AGEABLE //
            // START TAMEABLE //
-            case "CAMEL", "HORSE", "DONKEY", "LLAMA", "TRADER_LLAMA", "MULE", "SKELETON_HORSE", "ZOMBIE_HORSE" -> {
+            case "HORSE", "LLAMA", "SKELETON_HORSE", "DONKEY", "MULE" -> {
                AbstractHorse horse = (AbstractHorse) entity;
                horse.setJumpStrength(this.horse.jump);
                if (horse instanceof ChestedHorse) {
@ -558,7 +542,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                return entity;
            }
            // END INVENTORY HOLDER //
-            case "WOLF", "OCELOT", "CAT", "PARROT" -> {
+            case "WOLF", "OCELOT" -> {
                restoreTameable((Tameable) entity);
                restoreBreedable((Breedable) entity);
                restoreLiving((LivingEntity) entity);
@ -571,7 +555,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                    sheep.setSheared(true);
                }
                if (this.dataByte2 != 0) {
-                    sheep.setColor(DyeColor.values()[this.dataByte2]);
+                    sheep.setColor(DyeColor.getByDyeData(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,7 +42,6 @@ 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;
@ -58,7 +57,6 @@ 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;
@ -80,17 +78,10 @@ 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;
@ -161,8 +152,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;
@ -323,7 +314,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 instanceof ExplosiveMinecart) {
+                        if (near instanceof TNTPrimed || near.getType().equals(EntityType.MINECART_TNT)) {
                            if (!near.hasMetadata("plot")) {
                                near.setMetadata("plot", new FixedMetadataValue((Plugin) PlotSquared.platform(), plot));
                            }
@ -347,7 +338,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(EXPLOSION_HUGE, event.getLocation(), 0);
+            event.getLocation().getWorld().spawnParticle(Particle.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,10 +31,8 @@ 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;
@ -134,7 +132,7 @@ public class EntitySpawnListener implements Listener {
        Plot plot = location.getOwnedPlotAbs();
        EntityType type = entity.getType();
        if (plot == null) {
-            if (entity instanceof Item) {
+            if (type == EntityType.DROPPED_ITEM) {
                if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
                    event.setCancelled(true);
                }
@ -156,7 +154,7 @@ public class EntitySpawnListener implements Listener {
        if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
            event.setCancelled(true);
        }
-        if (entity instanceof EnderCrystal || type == EntityType.ARMOR_STAND) {
+        if (type == EntityType.ENDER_CRYSTAL || 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,7 +52,6 @@ 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;
@ -81,9 +80,6 @@ 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;

@ -232,7 +228,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.getKey().equals(ITEM)) {
+            if (type == EntityType.DROPPED_ITEM) {
                if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
                    event.setCancelled(true);
                }
@ -358,7 +354,7 @@ public class PaperListener implements Listener {
                event.setCancelled(true);
            }
        } else if (!plot.isAdded(pp.getUUID())) {
-            if (entity.getType().getKey().equals(FISHING_BOBBER)) {
+            if (entity.getType().equals(EntityType.FISHING_HOOK)) {
                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() instanceof Boat) {
+        if (e.getVehicle().getType() == EntityType.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.FishHook;
+import org.bukkit.entity.EntityType;
 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 instanceof FishHook) {
+            if (entity.getType().equals(EntityType.FISHING_HOOK)) {
                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 instanceof FishHook && plot.getFlag(
+                    ProjectilesFlag.class) || (entity.getType().equals(EntityType.FISHING_HOOK) && plot.getFlag(
                    FishingFlag.class))) {
                return;
            }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java
@ -62,28 +62,19 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
    private static final SideEffectSet EDGE_LIGHTING_SIDE_EFFECT_SET;

    static {
-        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);
+        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
+        );
    }

    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,7 +49,6 @@ 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;
@ -342,7 +341,8 @@ 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 instanceof Firework) {
+            if (EntityDamageEvent.DamageCause.ENTITY_EXPLOSION == cause
+                    && damager.getType() == EntityType.FIREWORK) {
                return false;
            }
        }
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -22,7 +22,7 @@ plugins {
 }

 group = "com.intellectualsites.plotsquared"
-version = "7.4.2-SNAPSHOT"
+version = "7.4.1-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.11.3")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.3")
    }

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

-val supportedVersions = listOf("1.19.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4")
+val supportedVersions = listOf("1.18.2", "1.19.4", "1.20.6", "1.21.1", "1.21.3")
 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.9.0"
-checkerqual = "3.48.4"
+spotbugs = "4.8.6"
+checkerqual = "3.48.3"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
-adventure = "4.18.0"
+adventure = "4.17.0"
 adventure-bukkit = "4.3.4"
 log4j = "2.19.0"

 # Plugins
 worldedit = "7.2.20"
-fawe = "2.12.3"
+fawe = "2.12.2"
 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 = "7.0.2"
+spotless = "6.25.0"
 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.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
--- a/3
+++ b/3
@ -86,7 +86,8 @@ 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\n' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum