Merge branch 'v6' into feature/v6/auto-merge-merge-cost

- Closes #3814

Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java

@@ -75,7 +75,7 @@ public class BukkitPlayer extends PlotPlayer<Player> {
      * @deprecated Please do not use this method. Instead use {@link BukkitUtil#adapt(Player)}, as it caches player objects.
      * This method will be made private in a future release.
      */
-    @Deprecated(forRemoval = true, since = "6.10.9")
+    @Deprecated(forRemoval = true, since = "TODO")
     public BukkitPlayer(
             final @NonNull PlotAreaManager plotAreaManager, final @NonNull EventDispatcher eventDispatcher,
             final @NonNull Player player, final @NonNull PermissionHandler permissionHandler
@@ -92,7 +92,7 @@ public class BukkitPlayer extends PlotPlayer<Player> {
      * @deprecated Please do not use this method. Instead use {@link BukkitUtil#adapt(Player)}, as it caches player objects.
      * This method will be made private in a future release.
      */
-    @Deprecated(forRemoval = true, since = "6.10.9")
+    @Deprecated(forRemoval = true, since = "TODO")
     public BukkitPlayer(
             final @NonNull PlotAreaManager plotAreaManager, final @NonNull
             EventDispatcher eventDispatcher, final @NonNull Player player,

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

@@ -56,7 +56,6 @@ import com.plotsquared.core.util.TabCompletions;
 import com.plotsquared.core.util.WorldUtil;
 import com.plotsquared.core.util.task.RunnableVal3;
 import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.EditSessionBuilder;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.entity.Player;
@@ -229,9 +228,10 @@ public class Area extends SubCommand {
                 try (final ClipboardWriter clipboardWriter = BuiltInClipboardFormat.SPONGE_SCHEMATIC.getWriter(new FileOutputStream(
                         file))) {
                     final BlockArrayClipboard clipboard = new BlockArrayClipboard(selectedRegion);
-                    EditSessionBuilder editSessionBuilder = WorldEdit.getInstance().newEditSessionBuilder();
+                    final EditSession editSession = WorldEdit
-                    editSessionBuilder.world(selectedRegion.getWorld());
+                            .getInstance()
-                    final EditSession editSession = editSessionBuilder.build();
+                            .getEditSessionFactory()
+                            .getEditSession(selectedRegion.getWorld(), -1);
                     final ForwardExtentCopy forwardExtentCopy =
                             new ForwardExtentCopy(editSession, selectedRegion, clipboard, selectedRegion.getMinimumPoint());
                     forwardExtentCopy.setCopyingBiomes(true);

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

@@ -290,10 +290,13 @@ 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 = (sizeX * sizeZ) * cost;
+            cost = size * cost + mergeCost;
             if (cost > 0d) {
                 if (!this.econHandler.isSupported()) {
                     player.sendMessage(TranslatableCaption.of("economy.vault_or_consumer_null"));

Core/src/main/java/com/plotsquared/core/components/ComponentPreset.java

@@ -62,7 +62,7 @@ public class ComponentPreset implements ConfigurationSerializable {
     public static ComponentPreset deserialize(final @NonNull Map<String, Object> map) {
         final ClassicPlotManagerComponent classicPlotManagerComponent = ClassicPlotManagerComponent
                 .fromString(map.getOrDefault("component", "").toString()).orElseThrow(() ->
-                        new IllegalArgumentException("The preset in components.yml needs a valid target component, got: " + map.get("component")));
+                        new IllegalArgumentException("The preset needs a valid target component"));
         final String pattern = map.getOrDefault("pattern", "").toString();
         final double cost = Double.parseDouble(map.getOrDefault("cost", "0.0").toString());
         final String permission = map.getOrDefault("permission", "").toString();

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

@@ -334,7 +334,7 @@ public final class PlotModificationManager {
      * @param createSign whether to recreate signs
      * @param whenDone   Task to run when unlink is complete
      * @return success/!cancelled
-     * @since 6.10.9
+     * @since TODO
      */
     public boolean unlinkPlot(final boolean createRoad, final boolean createSign, final Runnable whenDone) {
         if (!this.plot.isMerged()) {

build.gradle.kts

@@ -18,7 +18,7 @@ plugins {
 }
 
 group = "com.plotsquared"
-version = "6.10.9"
+version = "6.10.9-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""