fix: fix a specific situation where a merge can fail but take money still

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.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.3.2
+        uses: Ilshidur/action-discord@0.4.0
         with:
           args: |
             "<@&525015541815967744> <@&679322738552471574> <@&699293353862496266>"

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

@@ -177,8 +177,14 @@ 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 TabCompletions.completePlayers(player, String.join(",", args).trim(), Collections.emptyList());
+        return Collections.emptyList();
     }
 
 }

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

@@ -275,7 +275,7 @@ public class MainCommand extends Command {
     private CompletableFuture<Optional<CommandExecutionData>> prepareArguments(CommandExecutionData data) {
         if (data.args().length >= 2) {
             PlotArea area = data.player().getApplicablePlotArea();
-            Plot newPlot = Plot.fromString(area, data.args()[0]);
+            Plot newPlot = Plot.fromString(area, data.args()[0], data.player());
             return preparePlotArgument(newPlot, data, area)
                     .thenApply(d -> d.flatMap(x -> prepareFlagArgument(x, area)));
         } else {
@@ -296,7 +296,7 @@ public class MainCommand extends Command {
         final boolean isDenied = newPlot.isDenied(player.getUUID());
         if (!isAdmin) {
             if (isDenied) {
-                return CompletableFuture.completedFuture(Optional.of(data));
+                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));

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

@@ -40,6 +40,7 @@ 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",
@@ -116,9 +117,11 @@ public class Merge extends SubCommand {
         if (direction == null) {
             player.sendMessage(
                     TranslatableCaption.of("commandconfig.command_syntax"),
-                    TagResolver.resolver("value", Tag.inserting(Component.text(
-                            "/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]"
-                    )))
+                    TagResolver.resolver(
+                            "value", Tag.inserting(Component.text(
+                                    "/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]"
+                            ))
+                    )
             );
             player.sendMessage(
                     TranslatableCaption.of("help.direction"),
@@ -244,54 +247,66 @@ public class Merge extends SubCommand {
         }
         java.util.Set<UUID> uuids = adjacent.getOwners();
         boolean isOnline = false;
-        for (final UUID owner : uuids) {
-            final PlotPlayer<?> accepter = PlotSquared.platform().playerManager().getPlayerIfExists(owner);
-            if (!force && accepter == null) {
-                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;
+        if (!force) {
+            for (final UUID owner : uuids) {
+                final PlotPlayer<?> accepter = PlotSquared.platform().playerManager().getPlayerIfExists(owner);
+                if (accepter == null) {
+                    continue;
                 }
-                if (this.econHandler.isEnabled(plotArea) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON) && price > 0d) {
-                    if (!force && 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;
+                isOnline = true;
+                final Direction dir = direction;
+                Supplier<Boolean> run = () -> {
+                    accepter.sendMessage(TranslatableCaption.of("merge.merge_accepted"));
+                    if (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 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;
                     }
-                    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.no_available_automerge"));
+                    return false;
+                };
+                if (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::get
                     );
+                } else {
+                    return run.get();
                 }
-                player.sendMessage(TranslatableCaption.of("merge.success_merge"));
-                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();
+                // find first
+                break;
             }
         }
         if (force || !isOnline) {

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

@@ -321,7 +321,8 @@ public class Plot {
     }
 
     /**
-     * Get the plot from a string.
+     * Get the plot from a string. Performs a check to ensure Plot#getBottomAbs is not outside world bounds
+     * (x/z +/- 30,000,000) to prevent crashes
      *
      * @param player  Provides a context for what world to search in. Prefixing the term with 'world_name;' will override this context.
      * @param arg     The search term
@@ -332,6 +333,31 @@ public class Plot {
             final @Nullable PlotPlayer<?> player,
             final @Nullable String arg,
             final boolean message
+    ) {
+        Plot plot = getPlotFromStringUnchecked(player, arg, message);
+        if (plot != null && !WorldUtil.isValidLocation(plot.getBottomAbs())) {
+            if (message) {
+                (player == null ? ConsolePlayer.getConsole() : player).sendMessage(TranslatableCaption.of(
+                        "invalid.world_location_plot"));
+            }
+            return null;
+        }
+        return plot;
+    }
+
+    /**
+     * Get the plot from a string. Does not perform a check on world bounds.
+     *
+     * @param player  Provides a context for what world to search in. Prefixing the term with 'world_name;' will override this context.
+     * @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
+     */
+    public static @Nullable Plot getPlotFromStringUnchecked(
+            final @Nullable PlotPlayer<?> player,
+            final @Nullable String arg,
+            final boolean message
     ) {
         if (arg == null) {
             if (player == null) {
@@ -389,13 +415,51 @@ public class Plot {
     }
 
     /**
-     * Gets a plot from a string e.g. [area];[id]
+     * Gets a plot from a string e.g. [area];[id]. Performs a check to ensure Plot#getBottomAbs is not outside world bounds
+     * (x/z +/- 30,000,000) to prevent crashes
      *
      * @param defaultArea if no area is specified
      * @param string      plot id/area + id
      * @return New or existing plot object
      */
     public static @Nullable Plot fromString(final @Nullable PlotArea defaultArea, final @NonNull String string) {
+        return fromString(defaultArea, string, null);
+    }
+
+    /**
+     * Gets a plot from a string e.g. [area];[id]. Performs a check to ensure Plot#getBottomAbs is not outside world bounds
+     * (x/z +/- 30,000,000) to prevent crashes
+     *
+     * @param defaultArea if no area is specified
+     * @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
+     */
+    public static @Nullable Plot fromString(
+            final @Nullable PlotArea defaultArea,
+            final @NonNull String string,
+            final @Nullable PlotPlayer<?> player
+    ) {
+        Plot plot = fromStringUnchecked(defaultArea, string);
+        if (plot != null && !WorldUtil.isValidLocation(plot.getBottomAbs())) {
+            if (player != null) {
+                player.sendMessage(TranslatableCaption.of("invalid.world_location_plot"));
+            }
+            return null;
+        }
+        return plot;
+    }
+
+    /**
+     * Gets a plot from a string e.g. [area];[id]. Does not perform a check on world bounds.
+     *
+     * @param defaultArea if no area is specified
+     * @param string      plot id/area + id
+     * @return New or existing plot object
+     * @since 7.5.5
+     */
+    public static @Nullable Plot fromStringUnchecked(final @Nullable PlotArea defaultArea, final @NonNull String string) {
         final String[] split = string.split("[;,]");
         if (split.length == 2) {
             if (defaultArea != null) {
@@ -419,7 +483,8 @@ public class Plot {
     }
 
     /**
-     * Return a new/cached plot object at a given location.
+     * Return a new/cached plot object at a given location. Does not check world bounds for potential crashes, these should be
+     * performed before (or after) this method is used.
      *
      * <p>
      * Use {@link PlotPlayer#getCurrentPlot()} if a player is expected here.

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

@@ -371,8 +371,7 @@ public final class PlotModificationManager {
                             manager.createRoadSouthEast(current, queue);
                         }
                     }
-                }
-                if (current.isMerged(Direction.SOUTH)) {
+                } else 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 TODO
+     * @since 7.5.5
      */
     @Override
     public String toString() {

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

@@ -49,10 +49,12 @@ 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}
@@ -127,6 +129,22 @@ 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

@@ -234,6 +234,7 @@
   "invalid.not_valid_number": "<prefix><red>That's not a valid number within the range: </red><gray><value></gray>",
   "invalid.not_valid_plot_id": "<prefix><red>That's not a valid plot ID.</red>",
   "invalid.origin_cant_be_target": "<prefix><red>The origin and target location cannot be the same.</red>",
+  "invalid.world_location_plot": "<prefix><red>The target plot is invalid.</red>",
   "invalid.found_no_plots": "<prefix><red>Found no plots with your search query.</red>",
   "invalid.number_not_in_range": "<prefix><red>That's not a valid number within the range: <gray>(<min>, <max>)</gray></red>",
   "invalid.number_not_positive": "<red>That's not a positive number: <gray><value></gray></red>",
@@ -414,6 +415,7 @@
   "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.5-SNAPSHOT"
+version = "7.5.7-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""
@@ -67,8 +67,8 @@ subprojects {
 
     dependencies {
         // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:5.13.3")
-        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.3")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.13.4")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.4")
     }
 
     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.3"
+spotbugs = "4.9.4"
 checkerqual = "3.49.5"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
-adventure = "4.23.0"
-adventure-bukkit = "4.4.0"
+adventure = "4.24.0"
+adventure-bukkit = "4.4.1"
 log4j = "2.19.0"
 
 # Plugins
 worldedit = "7.2.20"
-fawe = "2.13.0"
+fawe = "2.13.1"
 placeholderapi = "2.11.6"
 luckperms = "5.5"
-essentialsx = "2.21.1"
+essentialsx = "2.21.2"
 mvdwapi = "3.1.1"
 
 # Third party
@@ -33,9 +33,9 @@ vault = "1.7.1"
 serverlib = "2.3.7"
 
 # Gradle plugins
-shadow = "8.3.8"
+shadow = "8.3.9"
 grgit = "4.1.1"
-spotless = "7.2.0"
+spotless = "7.2.1"
 publish = "0.34.0"
 runPaper = "2.3.1"