Update dependency com.diffplug.spotless to v7.2.1

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) {
-                return CompletableFuture.completedFuture(Optional.of(data));
-            }
-            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) {

gradle/libs.versions.toml

@@ -35,7 +35,7 @@ serverlib = "2.3.7"
 # Gradle plugins
 shadow = "8.3.8"
 grgit = "4.1.1"
-spotless = "7.2.0"
+spotless = "7.2.1"
 publish = "0.34.0"
 runPaper = "2.3.1"