Update gradle

.github/workflows/codeql.yml

@@ -21,11 +21,6 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
-      - name: Setup Java
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 17
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:

Bukkit/build.gradle.kts

@@ -62,7 +62,6 @@ tasks.processResources {
 }
 
 tasks.named<ShadowJar>("shadowJar") {
-    dependsOn(":PlotSquared-Core:shadowJar")
     dependencies {
         exclude(dependency("org.checkerframework:"))
     }

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

@@ -296,13 +296,10 @@ public class Auto extends SubCommand {
         }
         if (this.econHandler != null && plotarea.useEconomy()) {
             PlotExpression costExp = plotarea.getPrices().get("claim");
-            PlotExpression mergeCostExp = plotarea.getPrices().get("merge");
-            int size = sizeX * sizeZ;
-            double mergeCost = size > 1 && mergeCostExp == null ? 0d : mergeCostExp.evaluate(size);
             double cost = costExp.evaluate(Settings.Limit.GLOBAL ?
                     player.getPlotCount() :
                     player.getPlotCount(plotarea.getWorldName()));
-            cost = size * cost + mergeCost;
+            cost = (sizeX * sizeZ) * cost;
             if (cost > 0d) {
                 if (!this.econHandler.isSupported()) {
                     player.sendMessage(TranslatableCaption.of("economy.vault_or_consumer_null"));

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

@@ -109,7 +109,7 @@ public class Merge extends SubCommand {
                 }
             }
             if (direction == null && (args[0].equalsIgnoreCase("all") || args[0]
-                    .equalsIgnoreCase("auto")) && player.hasPermission(Permission.PERMISSION_MERGE_ALL)) {
+                    .equalsIgnoreCase("auto"))) {
                 direction = Direction.ALL;
             }
         }

Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java

@@ -379,11 +379,10 @@ public class ClassicPlotManager extends SquarePlotManager {
             }
         }
 
-        int yStart = classicPlotWorld.getMinBuildHeight() + (classicPlotWorld.PLOT_BEDROCK ? 1 : 0);
         if (!plot.isMerged(Direction.NORTH)) {
             int z = bot.getZ();
             for (int x = bot.getX(); x < top.getX(); x++) {
-                for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
+                for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }
@@ -391,7 +390,7 @@ public class ClassicPlotManager extends SquarePlotManager {
         if (!plot.isMerged(Direction.WEST)) {
             int x = bot.getX();
             for (int z = bot.getZ(); z < top.getZ(); z++) {
-                for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
+                for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }
@@ -399,7 +398,7 @@ public class ClassicPlotManager extends SquarePlotManager {
         if (!plot.isMerged(Direction.SOUTH)) {
             int z = top.getZ();
             for (int x = bot.getX(); x < top.getX() + (plot.isMerged(Direction.EAST) ? 0 : 1); x++) {
-                for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
+                for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }
@@ -407,7 +406,7 @@ public class ClassicPlotManager extends SquarePlotManager {
         if (!plot.isMerged(Direction.EAST)) {
             int x = top.getX();
             for (int z = bot.getZ(); z < top.getZ() + (plot.isMerged(Direction.SOUTH) ? 0 : 1); z++) {
-                for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
+                for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }

Core/src/main/java/com/plotsquared/core/permissions/Permission.java

@@ -45,7 +45,6 @@ public enum Permission implements ComponentLike {
     PERMISSION_ADMIN_ENTRY_FORCEFIELD("plots.admin.entry.forcefield"),
     PERMISSION_ADMIN_COMMANDS_CHATSPY("plots.admin.command.chatspy"),
     PERMISSION_MERGE("plots.merge"),
-    PERMISSION_MERGE_ALL("plots.merge.all"),
     PERMISSION_MERGE_OTHER("plots.merge.other"),
     PERMISSION_MERGE_KEEP_ROAD("plots.merge.keeproad"),
     PERMISSION_ADMIN_CAPS_OTHER("plots.admin.caps.other"),

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

@@ -20,6 +20,7 @@ package com.plotsquared.core.plot;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import com.google.inject.Inject;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.command.Like;
@@ -2417,6 +2418,7 @@ public class Plot {
         if (!this.isMerged()) {
             Location pos1 = this.getBottomAbs().withY(getArea().getMinBuildHeight());
             Location pos2 = this.getTopAbs().withY(getArea().getMaxBuildHeight());
+            this.connectedCache = Sets.newHashSet(this);
             CuboidRegion rg = new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3());
             return Collections.singleton(rg);
         }

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 # Platform expectations
-guice = "7.0.0"
+guice = "5.1.0"
 spotbugs = "4.7.3"
 
 # Plugins
@@ -20,7 +20,7 @@ squirrelid = "0.3.2"
 # Gradle plugins
 shadow = "8.1.1"
 grgit = "4.1.1"
-spotless = "6.19.0"
+spotless = "6.18.0"
 nexus = "1.3.0"
 
 [libraries]