feat: apply coord limits to more commands

- fixes #4375

.github/workflows/announce-release-on-discord.yml

@@ -11,7 +11,7 @@ jobs:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
           DISCORD_USERNAME: PlotSquared Release
           DISCORD_AVATAR: https://raw.githubusercontent.com/IntellectualSites/Assets/main/plugins/PlotSquared/PlotSquared.png
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@0.3.2
         with:
           args: |
             "<@&525015541815967744> <@&679322738552471574> <@&699293353862496266>"

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

@@ -177,14 +177,8 @@ public class Grant extends Command {
                 commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList()));
             }
             return commands;
-        } else if (args.length == 2) {
-            final String subcommand = args[0].toLowerCase();
-            if ((subcommand.equals("add") && player.hasPermission(Permission.PERMISSION_GRANT_ADD)) ||
-                (subcommand.equals("check") && player.hasPermission(Permission.PERMISSION_GRANT_CHECK))) {
-                return TabCompletions.completePlayers(player, args[1], Collections.emptyList());
-            }
         }
-        return Collections.emptyList();
+        return TabCompletions.completePlayers(player, String.join(",", args).trim(), Collections.emptyList());
     }
 
 }

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

@@ -283,41 +283,32 @@ public class MainCommand extends Command {
         }
     }
 
-    private CompletableFuture<Optional<CommandExecutionData>> preparePlotArgument(
+    private CompletableFuture<Optional<CommandExecutionData>> preparePlotArgument(@Nullable Plot newPlot,
-            @Nullable Plot newPlot,
+                                                                        @Nonnull CommandExecutionData data,
-            @Nonnull CommandExecutionData data,
+                                                                                  @Nullable PlotArea area) {
-            @Nullable PlotArea area
+        if (newPlot != null && (data.player() instanceof ConsolePlayer
-    ) {
+                || (area != null && area.equals(newPlot.getArea()))
-        if (newPlot == null) {
+                || data.player().hasPermission(Permission.PERMISSION_ADMIN)
-            return CompletableFuture.completedFuture(Optional.of(data));
+                || data.player().hasPermission(Permission.PERMISSION_ADMIN_AREA_SUDO))
+                && !newPlot.isDenied(data.player().getUUID())) {
+            return fetchPlotCenterLocation(newPlot)
+                    .thenApply(newLoc -> {
+                        if (!data.player().canTeleport(newLoc)) {
+                            data.player().sendMessage(TranslatableCaption.of("border.denied"));
+                            return Optional.empty();
+                        }
+                        // Save meta
+                        var originalCommandMeta = setCommandScope(data.player(), new TemporaryCommandMeta(newLoc, newPlot));
+                        return Optional.of(new CommandExecutionData(
+                                data.player(),
+                                Arrays.copyOfRange(data.args(), 1, data.args().length), // Trimmed command
+                                data.confirm(),
+                                data.whenDone(),
+                                originalCommandMeta
+                        ));
+                    });
         }
-        final PlotPlayer<?> player = data.player();
+        return CompletableFuture.completedFuture(Optional.of(data));
-        final boolean isAdmin = player instanceof ConsolePlayer || player.hasPermission(Permission.PERMISSION_ADMIN);
-        final boolean isDenied = newPlot.isDenied(player.getUUID());
-        if (!isAdmin) {
-            if (isDenied) {
-                throw new CommandException(TranslatableCaption.of("deny.cannot_interact"));
-            }
-            if (area != null && area.equals(newPlot.getArea()) && !player.hasPermission(Permission.PERMISSION_ADMIN_AREA_SUDO)) {
-                return CompletableFuture.completedFuture(Optional.of(data));
-            }
-        }
-        return fetchPlotCenterLocation(newPlot)
-                .thenApply(newLoc -> {
-                    if (!player.canTeleport(newLoc)) {
-                        player.sendMessage(TranslatableCaption.of("border.denied"));
-                        return Optional.empty();
-                    }
-                    // Save meta
-                    var originalCommandMeta = setCommandScope(player, new TemporaryCommandMeta(newLoc, newPlot));
-                    return Optional.of(new CommandExecutionData(
-                            player,
-                            Arrays.copyOfRange(data.args(), 1, data.args().length), // Trimmed command
-                            data.confirm(),
-                            data.whenDone(),
-                            originalCommandMeta
-                    ));
-                });
     }
 
     private Optional<CommandExecutionData> prepareFlagArgument(@Nonnull CommandExecutionData data, @Nonnull PlotArea area) {

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

@@ -40,7 +40,6 @@ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.UUID;
-import java.util.function.Supplier;
 
 @CommandDeclaration(command = "merge",
         aliases = "m",
@@ -117,11 +116,9 @@ public class Merge extends SubCommand {
         if (direction == null) {
             player.sendMessage(
                     TranslatableCaption.of("commandconfig.command_syntax"),
-                    TagResolver.resolver(
+                    TagResolver.resolver("value", Tag.inserting(Component.text(
-                            "value", Tag.inserting(Component.text(
+                            "/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]"
-                                    "/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]"
+                    )))
-                            ))
-                    )
             );
             player.sendMessage(
                     TranslatableCaption.of("help.direction"),
@@ -247,66 +244,54 @@ public class Merge extends SubCommand {
         }
         java.util.Set<UUID> uuids = adjacent.getOwners();
         boolean isOnline = false;
-        if (!force) {
+        for (final UUID owner : uuids) {
-            for (final UUID owner : uuids) {
+            final PlotPlayer<?> accepter = PlotSquared.platform().playerManager().getPlayerIfExists(owner);
-                final PlotPlayer<?> accepter = PlotSquared.platform().playerManager().getPlayerIfExists(owner);
+            if (!force && accepter == null) {
-                if (accepter == null) {
+                continue;
-                    continue;
+            }
+            isOnline = true;
+            final Direction dir = direction;
+            Runnable run = () -> {
+                accepter.sendMessage(TranslatableCaption.of("merge.merge_accepted"));
+                plot.getPlotModificationManager().autoMerge(dir, maxSize - size, owner, player, terrain);
+                PlotPlayer<?> plotPlayer = PlotSquared.platform().playerManager().getPlayerIfExists(player.getUUID());
+                if (plotPlayer == null) {
+                    accepter.sendMessage(TranslatableCaption.of("merge.merge_not_valid"));
+                    return;
                 }
-                isOnline = true;
+                if (this.econHandler.isEnabled(plotArea) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON) && price > 0d) {
-                final Direction dir = direction;
+                    if (!force && this.econHandler.getMoney(player) < price) {
-                Supplier<Boolean> run = () -> {
+                        player.sendMessage(
-                    accepter.sendMessage(TranslatableCaption.of("merge.merge_accepted"));
+                                TranslatableCaption.of("economy.cannot_afford_merge"),
-                    if (plot.getPlotModificationManager().autoMerge(dir, maxSize - size, owner, player, terrain)) {
+                                TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
-                        PlotPlayer<?> plotPlayer = PlotSquared.platform().playerManager().getPlayerIfExists(player.getUUID());
+                        );
-                        if (plotPlayer == null) {
+                        return;
-                            accepter.sendMessage(TranslatableCaption.of("merge.merge_not_valid"));
-                            return false;
-                        }
-                        if (this.econHandler.isEnabled(plotArea) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON) && price > 0d) {
-                            if (this.econHandler.getMoney(player) < price) {
-                                player.sendMessage(
-                                        TranslatableCaption.of("economy.cannot_afford_merge"),
-                                        TagResolver.resolver(
-                                                "money",
-                                                Tag.inserting(Component.text(this.econHandler.format(price)))
-                                        )
-                                );
-                                return false;
-                            }
-                            this.econHandler.withdrawMoney(player, price);
-                            player.sendMessage(
-                                    TranslatableCaption.of("economy.removed_balance"),
-                                    TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
-                            );
-                        }
-                        player.sendMessage(TranslatableCaption.of("merge.success_merge"));
-                        eventDispatcher.callPostMerge(player, plot);
-                        return true;
                     }
-                    player.sendMessage(TranslatableCaption.of("merge.no_available_automerge"));
+                    this.econHandler.withdrawMoney(player, price);
-                    return false;
+                    player.sendMessage(
-                };
+                            TranslatableCaption.of("economy.removed_balance"),
-                if (hasConfirmation(player)) {
+                            TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
-                    CmdConfirm.addPending(
-                            accepter, MINI_MESSAGE.serialize(MINI_MESSAGE
-                                    .deserialize(
-                                            TranslatableCaption.of("merge.merge_request_confirm").getComponent(player),
-                                            TagResolver.builder()
-                                                    .tag("player", Tag.inserting(Component.text(player.getName())))
-                                                    .tag(
-                                                            "location",
-                                                            Tag.inserting(Component.text(plot.getWorldName() + " " + plot.getId()))
-                                                    )
-                                                    .build()
-                                    )),
-                            run::get
                     );
-                } else {
-                    return run.get();
                 }
-                // find first
+                player.sendMessage(TranslatableCaption.of("merge.success_merge"));
-                break;
+                eventDispatcher.callPostMerge(player, plot);
+            };
+            if (!force && hasConfirmation(player)) {
+                CmdConfirm.addPending(accepter, MINI_MESSAGE.serialize(MINI_MESSAGE
+                                .deserialize(
+                                        TranslatableCaption.of("merge.merge_request_confirm").getComponent(player),
+                                        TagResolver.builder()
+                                                .tag("player", Tag.inserting(Component.text(player.getName())))
+                                                .tag(
+                                                        "location",
+                                                        Tag.inserting(Component.text(plot.getWorldName() + " " + plot.getId()))
+                                                )
+                                                .build()
+                                )),
+                        run
+                );
+            } else {
+                run.run();
             }
         }
         if (force || !isOnline) {

Core/src/main/java/com/plotsquared/core/plot/Plot.java

@@ -352,7 +352,7 @@ public class Plot {
      * @param arg     The search term
      * @param message If a message should be sent to the player if a plot cannot be found
      * @return The plot if only 1 result is found, or null
-     * @since 7.5.5
+     * @since TODO
      */
     public static @Nullable Plot getPlotFromStringUnchecked(
             final @Nullable PlotPlayer<?> player,
@@ -434,7 +434,7 @@ public class Plot {
      * @param string      plot id/area + id
      * @param player      {@link PlotPlayer} player to notify if plot is invalid (outside bounds)
      * @return New or existing plot object
-     * @since 7.5.5
+     * @since TODO
      */
     public static @Nullable Plot fromString(
             final @Nullable PlotArea defaultArea,
@@ -457,7 +457,7 @@ public class Plot {
      * @param defaultArea if no area is specified
      * @param string      plot id/area + id
      * @return New or existing plot object
-     * @since 7.5.5
+     * @since TODO
      */
     public static @Nullable Plot fromStringUnchecked(final @Nullable PlotArea defaultArea, final @NonNull String string) {
         final String[] split = string.split("[;,]");

Core/src/main/java/com/plotsquared/core/plot/PlotModificationManager.java

@@ -371,7 +371,8 @@ public final class PlotModificationManager {
                             manager.createRoadSouthEast(current, queue);
                         }
                     }
-                } else if (current.isMerged(Direction.SOUTH)) {
+                }
+                if (current.isMerged(Direction.SOUTH)) {
                     manager.createRoadSouth(current, queue);
                 }
             }

Core/src/main/java/com/plotsquared/core/plot/PlotTitle.java

@@ -67,7 +67,7 @@ public class PlotTitle {
      * Provides a string representation of this plot title value (used in placeholders).
      *
      * @return the plot title representation in the format {@code "<title>" "<subtitle>"}
-     * @since 7.5.5
+     * @since TODO
      */
     @Override
     public String toString() {

Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java

@@ -49,12 +49,10 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
 import java.util.TimeZone;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
-import java.util.stream.Collectors;
 
 /**
  * Registry that contains {@link Placeholder placeholders}
@@ -129,22 +127,6 @@ public final class PlaceholderRegistry {
             }
             return legacyComponent(TranslatableCaption.of("info.unknown"), player);
         });
-        this.createPlaceholder("currentplot_owners", (player, plot) -> {
-            if (plot.getFlag(ServerPlotFlag.class)) {
-                return legacyComponent(TranslatableCaption.of("info.server"), player);
-            }
-            final Set<UUID> plotOwners = plot.getOwners();
-            if (plotOwners.isEmpty()) {
-                return legacyComponent(TranslatableCaption.of("generic.generic_unowned"), player);
-            }
-            return plotOwners.stream().map(PlotSquared.platform().playerManager()::getUsernameCaption).map(f -> {
-                try {
-                    return f.get(Settings.UUID.BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS).getComponent(player);
-                } catch (final Exception ignored) {
-                    return legacyComponent(TranslatableCaption.of("info.unknown"), player);
-                }
-            }).collect(Collectors.joining(", "));
-        });
         this.createPlaceholder("currentplot_members", (player, plot) -> {
             if (plot.getMembers().isEmpty() && plot.getTrusted().isEmpty()) {
                 return legacyComponent(TranslatableCaption.of("info.none"), player);

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

@@ -415,7 +415,6 @@
   "deny.denied_added": "<prefix><dark_aqua>You successfully denied the player from this plot.</dark_aqua>",
   "deny.no_enter": "<prefix><red>You are denied from the plot <red><gold><plot></gold><red> and therefore not allowed to enter.</red>",
   "deny.you_got_denied": "<prefix><red>You are denied from the plot you were previously on, and got teleported to spawn.</red>",
-  "deny.cannot_interact": "<prefix><red>You are denied from the plot <red><gold><plot></gold><red> and therefore cannot interact with it.</red>",
   "deny.cant_remove_owner": "<prefix><red>You can't remove the plot owner.</red>",
   "kick.player_not_in_plot": "<prefix><red>The player <gray><player></gray> is not on this plot.</red>",
   "kick.cannot_kick_player": "<prefix><red>You cannot kick the player <gray><player></gray>.</red>",

build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.5.7-SNAPSHOT"
+version = "7.5.5-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""
@@ -67,8 +67,8 @@ subprojects {
 
     dependencies {
         // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:5.13.4")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.13.3")
-        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.4")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.3")
     }
 
     plugins.withId("java") {

gradle/libs.versions.toml

@@ -2,21 +2,21 @@
 # Platform expectations
 paper = "1.20.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
-spotbugs = "4.9.4"
+spotbugs = "4.9.3"
 checkerqual = "3.49.5"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
-adventure = "4.24.0"
+adventure = "4.23.0"
-adventure-bukkit = "4.4.1"
+adventure-bukkit = "4.4.0"
 log4j = "2.19.0"
 
 # Plugins
 worldedit = "7.2.20"
-fawe = "2.13.1"
+fawe = "2.13.0"
 placeholderapi = "2.11.6"
 luckperms = "5.5"
-essentialsx = "2.21.2"
+essentialsx = "2.21.1"
 mvdwapi = "3.1.1"
 
 # Third party
@@ -33,9 +33,9 @@ vault = "1.7.1"
 serverlib = "2.3.7"
 
 # Gradle plugins
-shadow = "8.3.9"
+shadow = "8.3.8"
 grgit = "4.1.1"
-spotless = "7.2.1"
+spotless = "7.2.0"
 publish = "0.34.0"
 runPaper = "2.3.1"