Update worldedit to v7.3.17

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

.github/workflows/build-pr.yml

@@ -9,7 +9,7 @@ jobs:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Validate Gradle Wrapper
         uses: gradle/actions/wrapper-validation@v5
       - name: Setup Java

.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Validate Gradle Wrapper
         uses: gradle/actions/wrapper-validation@v5
       - name: Setup Java

.github/workflows/codeql.yml

@@ -20,7 +20,7 @@ jobs:
         language: [ 'java' ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Setup Java
         uses: actions/setup-java@v5
         with:

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) {

gradle/libs.versions.toml

@@ -12,8 +12,8 @@ adventure-bukkit = "4.4.1"
 log4j = "2.19.0"
 
 # Plugins
-worldedit = "7.2.20"
+worldedit = "7.3.17"
-fawe = "2.14.0"
+fawe = "2.14.2"
 placeholderapi = "2.11.7"
 luckperms = "5.5"
 essentialsx = "2.21.2"