Release as java 21

Signed-off-by: Alexander Brandes <mc.cache@web.de>

.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.1'
         - '1.20.6'
         - '1.20.4'

.github/renovate.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base",
+    "config:recommended",
     ":semanticCommitsDisabled"
   ],
   "automerge": true,

Bukkit/build.gradle.kts

@@ -104,9 +104,9 @@ tasks {
         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/4.14.0/")
+        opt.links("https://jd.advntr.dev/api/" + libs.adventureApi.get().versionConstraint.toString())
         opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
-    //    opt.links("https://checkerframework.org/api/")
+        opt.links("https://checkerframework.org/api/")
         opt.isLinkSource = true
         opt.bottom(File("$rootDir/javadocfooter.html").readText())
         opt.isUse = true

Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java

@@ -822,12 +822,18 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                             // Temporarily classify as vehicle
                         case "MINECART":
                         case "MINECART_CHEST":
+                        case "CHEST_MINECART":
                         case "MINECART_COMMAND":
+                        case "COMMAND_BLOCK_MINECART":
                         case "MINECART_FURNACE":
+                        case "FURNACE_MINECART":
                         case "MINECART_HOPPER":
+                        case "HOPPER_MINECART":
                         case "MINECART_MOB_SPAWNER":
+                        case "SPAWNER_MINECART":
                         case "ENDER_CRYSTAL":
                         case "MINECART_TNT":
+                        case "TNT_MINECART":
                         case "CHEST_BOAT":
                         case "BOAT":
                             if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
@@ -1165,7 +1171,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

Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java

@@ -52,7 +52,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.EnumSet;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
@@ -445,7 +445,7 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
         private static final List<Biome> BIOMES;
 
         static {
-            Set<Biome> disabledBiomes = EnumSet.of(Biome.CUSTOM);
+            Set<Biome> disabledBiomes = new HashSet<>(List.of(Biome.CUSTOM));
             if (PlotSquared.platform().serverVersion()[1] <= 19) {
                 final Biome cherryGrove = Registry.BIOME.get(NamespacedKey.minecraft("cherry_grove"));
                 if (cherryGrove != null) {

Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java

@@ -37,6 +37,7 @@ import com.plotsquared.core.plot.flag.implementations.EntityChangeBlockFlag;
 import com.plotsquared.core.plot.flag.implementations.ExplosionFlag;
 import com.plotsquared.core.plot.flag.implementations.InvincibleFlag;
 import com.plotsquared.core.plot.flag.implementations.ProjectileChangeBlockFlag;
+import com.plotsquared.core.plot.flag.implementations.WeavingDeathPlace;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.PlotFlagUtil;
@@ -243,6 +244,29 @@ public class EntityEventListener implements Listener {
         }
     }
 
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
+    public void onWeavingEffect(EntityChangeBlockEvent event) {
+        if (event.getTo() != Material.COBWEB) {
+            return;
+        }
+        Location location = BukkitUtil.adapt(event.getBlock().getLocation());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        Plot plot = location.getOwnedPlot();
+        if (plot == null) {
+            if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, WeavingDeathPlace.class, false)) {
+                event.setCancelled(true);
+            }
+            return;
+        }
+        if (!plot.getFlag(WeavingDeathPlace.class)) {
+            plot.debug(event.getTo() + " could not spawn because weaving-death-place = false");
+            event.setCancelled(true);
+        }
+    }
+
     @EventHandler(priority = EventPriority.HIGH)
     public void onDamage(EntityDamageEvent event) {
         if (event.getEntityType() != EntityType.PLAYER) {
@@ -401,7 +425,13 @@ public class EntityEventListener implements Listener {
         }
 
         Plot plot = area.getOwnedPlot(location);
-        if (plot != null && !plot.getFlag(EntityChangeBlockFlag.class)) {
+        if (plot == null) {
+            if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, EntityChangeBlockFlag.class, false)) {
+                event.setCancelled(true);
+            }
+            return;
+        }
+        if (!plot.getFlag(EntityChangeBlockFlag.class)) {
             plot.debug(e.getType() + " could not change block because entity-change-block = false");
             event.setCancelled(true);
         }

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java

@@ -47,6 +47,7 @@ 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;
@@ -58,6 +59,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;
@@ -104,33 +106,7 @@ public class PaperListener implements Listener {
         if (!Settings.Paper_Components.ENTITY_PATHING) {
             return;
         }
-        Location toLoc = BukkitUtil.adapt(event.getLoc());
+        handleEntityMovement(event, event.getEntity().getLocation(), 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);
     }
 
     @EventHandler
@@ -145,8 +121,23 @@ public class PaperListener implements Listener {
             return;
         }
 
-        Location toLoc = BukkitUtil.adapt(b.getLocation());
+        handleEntityMovement(event, event.getEntity().getLocation(),  b.getLocation());
-        Location fromLoc = BukkitUtil.adapt(event.getEntity().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 +146,6 @@ public class PaperListener implements Listener {
         if (farea == null) {
             return;
         }
-
         if (tarea != farea) {
             event.setCancelled(true);
             return;
@@ -166,10 +156,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);

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java

@@ -54,6 +54,7 @@ import com.plotsquared.core.plot.flag.implementations.EditSignFlag;
 import com.plotsquared.core.plot.flag.implementations.HangingBreakFlag;
 import com.plotsquared.core.plot.flag.implementations.HangingPlaceFlag;
 import com.plotsquared.core.plot.flag.implementations.HostileInteractFlag;
+import com.plotsquared.core.plot.flag.implementations.InteractionInteractFlag;
 import com.plotsquared.core.plot.flag.implementations.ItemDropFlag;
 import com.plotsquared.core.plot.flag.implementations.KeepInventoryFlag;
 import com.plotsquared.core.plot.flag.implementations.LecternReadBookFlag;
@@ -1737,6 +1738,11 @@ public class PlayerEventListener implements Listener {
                 return;
             }
 
+            if (EntityCategories.INTERACTION.contains(entityType) && flagContainer
+                    .getFlag(InteractionInteractFlag.class).getValue()) {
+                return;
+            }
+
             if (EntityCategories.VILLAGER.contains(entityType) && flagContainer
                     .getFlag(VillagerInteractFlag.class).getValue()) {
                 return;

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);
             }

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(
+        NO_SIDE_EFFECT_SET = enableNetworkIfNeeded()
-                SideEffect.NEIGHBORS,
+                .with(SideEffect.LIGHTING, SideEffect.State.OFF)
-                SideEffect.State.OFF
+                .with(SideEffect.NEIGHBORS, SideEffect.State.OFF);
-        );
+        EDGE_SIDE_EFFECT_SET = NO_SIDE_EFFECT_SET
-        EDGE_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.UPDATE, SideEffect.State.ON).with(
+                .with(SideEffect.UPDATE, SideEffect.State.ON)
-                SideEffect.NEIGHBORS,
+                .with(SideEffect.NEIGHBORS, SideEffect.State.ON);
-                SideEffect.State.ON
+        LIGHTING_SIDE_EFFECT_SET = NO_SIDE_EFFECT_SET
-        );
+                .with(SideEffect.NEIGHBORS, SideEffect.State.OFF);
-        LIGHTING_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.NEIGHBORS, SideEffect.State.OFF);
+        EDGE_LIGHTING_SIDE_EFFECT_SET = NO_SIDE_EFFECT_SET
-        EDGE_LIGHTING_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.UPDATE, SideEffect.State.ON).with(
+                .with(SideEffect.UPDATE, SideEffect.State.ON)
-                SideEffect.NEIGHBORS,
+                .with(SideEffect.NEIGHBORS, SideEffect.State.ON);
-                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;

Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java

@@ -75,6 +75,7 @@ import org.bukkit.entity.FallingBlock;
 import org.bukkit.entity.Firework;
 import org.bukkit.entity.Ghast;
 import org.bukkit.entity.Hanging;
+import org.bukkit.entity.Interaction;
 import org.bukkit.entity.IronGolem;
 import org.bukkit.entity.Item;
 import org.bukkit.entity.LightningStrike;
@@ -432,6 +433,7 @@ public class BukkitUtil extends WorldUtil {
     @Override
     public @NonNull Set<com.sk89q.worldedit.world.entity.EntityType> getTypesInCategory(final @NonNull String category) {
         final Collection<Class<?>> allowedInterfaces = new HashSet<>();
+        final int[] version = PlotSquared.platform().serverVersion();
         switch (category) {
             case "animal" -> {
                 allowedInterfaces.add(IronGolem.class);
@@ -439,7 +441,7 @@ public class BukkitUtil extends WorldUtil {
                 allowedInterfaces.add(Animals.class);
                 allowedInterfaces.add(WaterMob.class);
                 allowedInterfaces.add(Ambient.class);
-                if (PlotSquared.platform().serverVersion()[1] >= 19) {
+                if (version[1] >= 19) {
                     allowedInterfaces.add(Allay.class);
                 }
             }
@@ -470,6 +472,11 @@ public class BukkitUtil extends WorldUtil {
                 allowedInterfaces.add(Firework.class);
             }
             case "player" -> allowedInterfaces.add(Player.class);
+            case "interaction" -> {
+                if ((version[1] > 19) || (version[1] == 19 && version[2] >= 4)) {
+                    allowedInterfaces.add(Interaction.class);
+                }
+            }
             default -> LOGGER.error("Unknown entity category requested: {}", category);
         }
         final Set<com.sk89q.worldedit.world.entity.EntityType> types = new HashSet<>();

Core/build.gradle.kts

@@ -68,10 +68,10 @@ tasks {
         val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
         val opt = options as StandardJavadocDocletOptions
         opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/" + libs.worldeditCore.get().versionConstraint.toString())
-        opt.links("https://jd.advntr.dev/api/4.14.0/")
+        opt.links("https://jd.advntr.dev/api/" + libs.adventureApi.get().versionConstraint.toString())
-        opt.links("https://jd.advntr.dev/text-minimessage/4.14.0/")
+        opt.links("https://jd.advntr.dev/text-minimessage/" + libs.adventureApi.get().versionConstraint.toString())
         opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
-      //  opt.links("https://checkerframework.org/api/")
+        opt.links("https://checkerframework.org/api/")
         opt.isLinkSource = true
         opt.bottom(File("$rootDir/javadocfooter.html").readText())
         opt.isUse = true

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);
         }
     }
 
@@ -795,9 +796,8 @@ public class PlotSquared {
         if (world.equals("CheckingPlotSquaredGenerator")) {
             return;
         }
-        if (!this.getPlotAreaManager().addWorld(world)) {
+        // Don't check the return result -> breaks runtime loading of single plot areas on creation
-            return;
+        this.getPlotAreaManager().addWorld(world);
-        }
         Set<String> worlds;
         if (this.worldConfiguration.contains("worlds")) {
             worlds = this.worldConfiguration.getConfigurationSection("worlds").getKeys(false);

Core/src/main/java/com/plotsquared/core/command/Area.java

@@ -184,6 +184,7 @@ public class Area extends SubCommand {
                         CuboidRegion.makeCuboid(playerSelectedRegion)
                 ).length != 0) {
                     player.sendMessage(TranslatableCaption.of("single.single_area_overlapping"));
+                    return false;
                 }
                 // Alter the region
                 final BlockVector3 playerSelectionMin = playerSelectedRegion.getMinimumPoint();

Core/src/main/java/com/plotsquared/core/command/Kick.java

@@ -153,7 +153,7 @@ public class Kick extends SubCommand {
         if (plot == null) {
             return Collections.emptyList();
         }
-        return TabCompletions.completePlayersInPlot(plot, String.join(",", args).trim(),
+        return TabCompletions.completePlayersInPlot(player, plot, String.join(",", args).trim(),
                 Collections.singletonList(player.getName())
         );
     }

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;

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();

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;

Core/src/main/java/com/plotsquared/core/configuration/Storage.java

@@ -46,7 +46,7 @@ public class Storage extends Config {
         public static String PASSWORD = "password";
         public static String DATABASE = "plot_db";
 
-        @Comment("Set additional properties: https://goo.gl/wngtN8")
+        @Comment("Set additional properties: https://dev.mysql.com/doc/connector-j/en/connector-j-reference-configuration-properties.html")
         public static List<String>
                 PROPERTIES = new ArrayList<>(Collections.singletonList("useSSL=false"));
 

Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java

@@ -65,6 +65,7 @@ import com.plotsquared.core.plot.flag.implementations.HostileInteractFlag;
 import com.plotsquared.core.plot.flag.implementations.IceFormFlag;
 import com.plotsquared.core.plot.flag.implementations.IceMeltFlag;
 import com.plotsquared.core.plot.flag.implementations.InstabreakFlag;
+import com.plotsquared.core.plot.flag.implementations.InteractionInteractFlag;
 import com.plotsquared.core.plot.flag.implementations.InvincibleFlag;
 import com.plotsquared.core.plot.flag.implementations.ItemDropFlag;
 import com.plotsquared.core.plot.flag.implementations.KeepFlag;
@@ -92,6 +93,7 @@ import com.plotsquared.core.plot.flag.implementations.PreventCreativeCopyFlag;
 import com.plotsquared.core.plot.flag.implementations.PriceFlag;
 import com.plotsquared.core.plot.flag.implementations.ProjectileChangeBlockFlag;
 import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
+import com.plotsquared.core.plot.flag.implementations.WeavingDeathPlace;
 import com.plotsquared.core.plot.flag.implementations.PveFlag;
 import com.plotsquared.core.plot.flag.implementations.PvpFlag;
 import com.plotsquared.core.plot.flag.implementations.RedstoneFlag;
@@ -171,6 +173,7 @@ public final class GlobalFlagContainer extends FlagContainer {
         this.addFlag(IceFormFlag.ICE_FORM_FALSE);
         this.addFlag(IceMeltFlag.ICE_MELT_FALSE);
         this.addFlag(InstabreakFlag.INSTABREAK_FALSE);
+        this.addFlag(InteractionInteractFlag.INTERACTION_INTERACT_FALSE);
         this.addFlag(InvincibleFlag.INVINCIBLE_FALSE);
         this.addFlag(ItemDropFlag.ITEM_DROP_TRUE);
         this.addFlag(KeepInventoryFlag.KEEP_INVENTORY_FALSE);
@@ -207,6 +210,7 @@ public final class GlobalFlagContainer extends FlagContainer {
         this.addFlag(VillagerInteractFlag.VILLAGER_INTERACT_FALSE);
         this.addFlag(VineGrowFlag.VINE_GROW_TRUE);
         this.addFlag(ProjectilesFlag.PROJECTILES_FALSE);
+        this.addFlag(WeavingDeathPlace.WEAVING_DEATH_PLACE_FALSE);
 
         // Double flags
         this.addFlag(PriceFlag.PRICE_NOT_BUYABLE);

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/InteractionInteractFlag.java

@@ -0,0 +1,39 @@
+/*
+ * PlotSquared, a land and world management plugin for Minecraft.
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ * Copyright (C) IntellectualSites team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.core.plot.flag.implementations;
+
+import com.plotsquared.core.configuration.caption.TranslatableCaption;
+import com.plotsquared.core.plot.flag.types.BooleanFlag;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+public class InteractionInteractFlag extends BooleanFlag<InteractionInteractFlag> {
+
+    public static final InteractionInteractFlag INTERACTION_INTERACT_TRUE = new InteractionInteractFlag(true);
+    public static final InteractionInteractFlag INTERACTION_INTERACT_FALSE = new InteractionInteractFlag(false);
+
+    private InteractionInteractFlag(boolean value) {
+        super(value, TranslatableCaption.of("flags.flag_description_interaction_interact"));
+    }
+
+    @Override
+    protected InteractionInteractFlag flagOf(@NonNull Boolean value) {
+        return value ? INTERACTION_INTERACT_TRUE : INTERACTION_INTERACT_FALSE;
+    }
+
+}

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/WeavingDeathPlace.java

@@ -0,0 +1,39 @@
+/*
+ * PlotSquared, a land and world management plugin for Minecraft.
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ * Copyright (C) IntellectualSites team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.core.plot.flag.implementations;
+
+import com.plotsquared.core.configuration.caption.TranslatableCaption;
+import com.plotsquared.core.plot.flag.types.BooleanFlag;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+public class WeavingDeathPlace extends BooleanFlag<WeavingDeathPlace> {
+
+    public static final WeavingDeathPlace WEAVING_DEATH_PLACE_TRUE = new WeavingDeathPlace(true);
+    public static final WeavingDeathPlace WEAVING_DEATH_PLACE_FALSE = new WeavingDeathPlace(false);
+
+    private WeavingDeathPlace(boolean value) {
+        super(value, TranslatableCaption.of("flags.flag_description_weaving_death_place"));
+    }
+
+    @Override
+    protected WeavingDeathPlace flagOf(@NonNull Boolean value) {
+        return value ? WEAVING_DEATH_PLACE_TRUE : WEAVING_DEATH_PLACE_FALSE;
+    }
+
+}

Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java

@@ -371,7 +371,10 @@ public class EventDispatcher {
             Location location, BlockType blockType, boolean notifyPerms
     ) {
         PlotArea area = location.getPlotArea();
-        assert area != null;
+        // the interaction target location might be outside a plot area
+        if (area == null) {
+            return true;
+        }
         if (!area.buildRangeContainsY(location.getY()) && !player.hasPermission(Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
             player.sendMessage(
                     TranslatableCaption.of("height.height_limit"),

Core/src/main/java/com/plotsquared/core/util/TabCompletions.java

@@ -107,6 +107,7 @@ public final class TabCompletions {
     }
 
     public static @NonNull List<Command> completePlayersInPlot(
+            final @NonNull PlotPlayer<?> issuer,
             final @NonNull Plot plot,
             final @NonNull String input, final @NonNull List<String> existing
     ) {
@@ -115,8 +116,10 @@ public final class TabCompletions {
             final List<PlotPlayer<?>> inPlot = plot.getPlayersInPlot();
             players = new ArrayList<>(inPlot.size());
             for (PlotPlayer<?> player : inPlot) {
+                if (issuer.canSee(player)) {
                     players.add(player.getName());
                 }
+            }
             cachedCompletionValues.put("inPlot" + plot, players);
         }
         return filterCached(players, input, existing);

Core/src/main/java/com/plotsquared/core/util/entity/EntityCategories.java

@@ -41,6 +41,7 @@ public class EntityCategories {
     public static final EntityCategory PROJECTILE = register("projectile");
     public static final EntityCategory OTHER = register("other");
     public static final EntityCategory PLAYER = register("player");
+    public static final EntityCategory INTERACTION = register("interaction");
 
     public static EntityCategory register(final String id) {
         final EntityCategory entityCategory = new EntityCategory(PlotSquared.platform().worldUtil(), id);

Core/src/main/resources/lang/messages_en.json

@@ -572,6 +572,7 @@
   "flags.flag_description_ice_form": "<gray>Set to `true` to allow ice to form in the plot.</gray>",
   "flags.flag_description_ice_melt": "<gray>Set to `false` to disable ice melting in the plot.</gray>",
   "flags.flag_description_instabreak": "<gray>Set to `true` to allow blocks to be instantaneously broken in survival mode.</gray>",
+  "flags.flag_description_interaction_interact": "<gray>Set to `true` to allow guests to interact with interaction entities in the plot.</gray>",
   "flags.flag_description_invincible": "<gray>Set to `true` to prevent players from taking damage inside the plot.</gray>",
   "flags.flag_description_item_drop": "<gray>Set to `false` to prevent items from being dropped inside the plot.</gray>",
   "flags.flag_description_kelp_grow": "<gray>Set to `false` to prevent kelp from growing in the plot.</gray>",
@@ -628,6 +629,7 @@
   "flags.flag_description_prevent_creative_copy": "<gray>Prevents people from copying item NBT data in the plot unless they're added as members.</gray>",
   "flags.flag_description_leaf_decay": "<gray>Set to `false` to prevent leaves from decaying.",
   "flags.flag_description_projectiles": "<gray>Prevents guests from shooting projectiles on the plot when set to false.</gray>",
+  "flags.flag_description_weaving_death_place": "<gray>Set to `false` to prevent spawning of cobwebs by the Weaving status effect on the death of an entity.</gray>",
   "flags.flag_description_beacon_effect": "<gray>Enables beacon effects on the plot.</gray>",
   "flags.flag_error_boolean": "Flag value must be a boolean (true | false).",
   "flags.flag_error_enum": "Must be one of: <list>",

build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.3.10-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.0")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.11.4")
-        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.0")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.4")
     }
 
     plugins.withId("java") {
@@ -89,10 +89,6 @@ subprojects {
         }
     }
 
-    tasks.compileJava.configure {
-        options.release.set(17)
-    }
-
     configurations.all {
         attributes.attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 21)
     }
@@ -230,7 +226,7 @@ tasks.getByName<Jar>("jar") {
     enabled = false
 }
 
-val supportedVersions = listOf("1.18.2", "1.19.4", "1.20.6", "1.21.1")
+val supportedVersions = listOf("1.18.2", "1.19.4", "1.20.6", "1.21.1", "1.21.4")
 tasks {
     register("cacheLatestFaweArtifact") {
         val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()

gradle/libs.versions.toml

@@ -3,17 +3,17 @@
 paper = "1.20.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
 spotbugs = "4.8.6"
-checkerqual = "3.46.0"
+checkerqual = "3.48.3"
 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.11.0"
+fawe = "2.12.3"
 placeholderapi = "2.11.6"
 luckperms = "5.4"
 essentialsx = "2.20.1"
@@ -26,18 +26,18 @@ cloud-services = "1.8.4"
 arkitektonika = "2.1.3"
 squirrelid = "0.3.2"
 paster = "1.1.6"
-bstats = "3.0.2"
+bstats = "3.1.0"
 paperlib = "1.0.8"
 informative-annotations = "1.5"
 vault = "1.7.1"
 serverlib = "2.3.6"
 
 # Gradle plugins
-shadow = "8.1.1"
+shadow = "8.3.5"
 grgit = "4.1.1"
 spotless = "6.25.0"
 nexus = "2.0.0"
-runPaper = "2.3.0"
+runPaper = "2.3.1"
 
 [libraries]
 # Platform expectations
@@ -78,7 +78,7 @@ vault = { group = "com.github.MilkBowl", name = "VaultAPI", version.ref = "vault
 serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.ref = "serverlib" }
 
 [plugins]
-shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
+shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
 grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
 nexus = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
-' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

javadocfooter.html

@@ -1,4 +1,4 @@
 Javadocs generated for
 <a href="https://github.com/IntellectualSites/PlotSquared/" rel="noopener nofollow noreferrer" target="_blank"> PlotSquared</a> |
 <a href="https://intellectualsites.gitbook.io/plotsquared/" rel="noopener nofollow noreferrer"> Documentation </a> |
-Visit us on our <a href="https://discord.gg/intellectualsites" rel="noopener nofollow noreferrer"> Discord server</a> :)
+&nbsp;Visit us on our <a href="https://discord.gg/intellectualsites" rel="noopener nofollow noreferrer"> Discord server</a> :)