diff --git a/Core/src/main/java/com/plotsquared/core/command/Merge.java b/Core/src/main/java/com/plotsquared/core/command/Merge.java index 5217a170a..834f2de9d 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Merge.java +++ b/Core/src/main/java/com/plotsquared/core/command/Merge.java @@ -157,6 +157,15 @@ public class Merge extends SubCommand { final double price = priceExr == null ? 0d : priceExr.evaluate(size); UUID uuid = player.getUUID(); + + if (!force && !plot.isOwner(uuid)) { + if (!Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_MERGE)) { + player.sendMessage(TranslatableCaption.of("permission.no_plot_perms")); + return false; + } else { + uuid = plot.getOwnerAbs(); + } + } if (direction == Direction.ALL) { boolean terrain = true; if (args.length == 2) { @@ -185,14 +194,6 @@ public class Merge extends SubCommand { player.sendMessage(TranslatableCaption.of("merge.no_available_automerge")); return false; } - if (!force && !plot.isOwner(uuid)) { - if (!Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_MERGE)) { - player.sendMessage(TranslatableCaption.of("permission.no_plot_perms")); - return false; - } else { - uuid = plot.getOwnerAbs(); - } - } if (!force && this.econHandler.isEnabled(plotArea) && price > 0d && this.econHandler.getMoney(player) < price) { player.sendMessage(