feat: apply coord limits to more commands

- fixes #4375

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

@@ -283,35 +283,24 @@ public class MainCommand extends Command {
         }
     }
 
-    private CompletableFuture<Optional<CommandExecutionData>> preparePlotArgument(
-            @Nullable Plot newPlot,
+    private CompletableFuture<Optional<CommandExecutionData>> preparePlotArgument(@Nullable Plot newPlot,
                                                                         @Nonnull CommandExecutionData data,
-            @Nullable PlotArea area
-    ) {
-        if (newPlot == null) {
-            return CompletableFuture.completedFuture(Optional.of(data));
-        }
-        final PlotPlayer<?> player = data.player();
-        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));
-            }
-        }
+                                                                                  @Nullable PlotArea area) {
+        if (newPlot != null && (data.player() instanceof ConsolePlayer
+                || (area != null && area.equals(newPlot.getArea()))
+                || data.player().hasPermission(Permission.PERMISSION_ADMIN)
+                || data.player().hasPermission(Permission.PERMISSION_ADMIN_AREA_SUDO))
+                && !newPlot.isDenied(data.player().getUUID())) {
             return fetchPlotCenterLocation(newPlot)
                     .thenApply(newLoc -> {
-                    if (!player.canTeleport(newLoc)) {
-                        player.sendMessage(TranslatableCaption.of("border.denied"));
+                        if (!data.player().canTeleport(newLoc)) {
+                            data.player().sendMessage(TranslatableCaption.of("border.denied"));
                             return Optional.empty();
                         }
                         // Save meta
-                    var originalCommandMeta = setCommandScope(player, new TemporaryCommandMeta(newLoc, newPlot));
+                        var originalCommandMeta = setCommandScope(data.player(), new TemporaryCommandMeta(newLoc, newPlot));
                         return Optional.of(new CommandExecutionData(
-                            player,
+                                data.player(),
                                 Arrays.copyOfRange(data.args(), 1, data.args().length), // Trimmed command
                                 data.confirm(),
                                 data.whenDone(),
@@ -319,6 +308,8 @@ public class MainCommand extends Command {
                         ));
                     });
         }
+        return CompletableFuture.completedFuture(Optional.of(data));
+    }
 
     private Optional<CommandExecutionData> prepareFlagArgument(@Nonnull CommandExecutionData data, @Nonnull PlotArea area) {
         if (data.args().length >= 2 && !data.args()[0].isEmpty() && data.args()[0].charAt(0) == '-') {

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/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")
-        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.4")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.13.3")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.3")
     }
 
     plugins.withId("java") {

gradle/libs.versions.toml

@@ -8,7 +8,7 @@ gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
 adventure = "4.23.0"
-adventure-bukkit = "4.4.1"
+adventure-bukkit = "4.4.0"
 log4j = "2.19.0"
 
 # Plugins
@@ -35,7 +35,7 @@ serverlib = "2.3.7"
 # Gradle plugins
 shadow = "8.3.8"
 grgit = "4.1.1"
-spotless = "7.2.1"
+spotless = "7.2.0"
 publish = "0.34.0"
 runPaper = "2.3.1"