fix: fix a specific situation where a merge can fail but take money still

Signed-off-by: Alexander Brandes <mc.cache@web.de>

Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java

@@ -219,7 +219,7 @@ public class BlockEventListener implements Listener {
         }
     }
 
-    @EventHandler(priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void blockDestroy(BlockBreakEvent event) {
         Player player = event.getPlayer();
         Location location = BukkitUtil.adapt(event.getBlock().getLocation());

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java

@@ -104,6 +104,10 @@ public class PaperListener implements Listener {
         }
         Plot plot = area.getPlot(location);
         if (plot != null) {
+            // Prevent dropping blocks which normally would not be dropped.
+            if (!event.willDrop()) {
+                return;
+            }
             event.setWillDrop(plot.getFlag(TileDropFlag.class));
         }
     }

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

@@ -40,6 +40,7 @@ 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",
@@ -116,9 +117,11 @@ public class Merge extends SubCommand {
         if (direction == null) {
             player.sendMessage(
                     TranslatableCaption.of("commandconfig.command_syntax"),
-                    TagResolver.resolver("value", Tag.inserting(Component.text(
+                    TagResolver.resolver(
-                            "/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]"
+                            "value", Tag.inserting(Component.text(
-                    )))
+                                    "/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]"
+                            ))
+                    )
             );
             player.sendMessage(
                     TranslatableCaption.of("help.direction"),
@@ -244,54 +247,66 @@ public class Merge extends SubCommand {
         }
         java.util.Set<UUID> uuids = adjacent.getOwners();
         boolean isOnline = false;
-        for (final UUID owner : uuids) {
+        if (!force) {
-            final PlotPlayer<?> accepter = PlotSquared.platform().playerManager().getPlayerIfExists(owner);
+            for (final UUID owner : uuids) {
-            if (!force && accepter == null) {
+                final PlotPlayer<?> accepter = PlotSquared.platform().playerManager().getPlayerIfExists(owner);
-                continue;
+                if (accepter == null) {
-            }
+                    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;
                 }
-                if (this.econHandler.isEnabled(plotArea) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON) && price > 0d) {
+                isOnline = true;
-                    if (!force && this.econHandler.getMoney(player) < price) {
+                final Direction dir = direction;
-                        player.sendMessage(
+                Supplier<Boolean> run = () -> {
-                                TranslatableCaption.of("economy.cannot_afford_merge"),
+                    accepter.sendMessage(TranslatableCaption.of("merge.merge_accepted"));
-                                TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
+                    if (plot.getPlotModificationManager().autoMerge(dir, maxSize - size, owner, player, terrain)) {
-                        );
+                        PlotPlayer<?> plotPlayer = PlotSquared.platform().playerManager().getPlayerIfExists(player.getUUID());
-                        return;
+                        if (plotPlayer == null) {
+                            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;
                     }
-                    this.econHandler.withdrawMoney(player, price);
+                    player.sendMessage(TranslatableCaption.of("merge.no_available_automerge"));
-                    player.sendMessage(
+                    return false;
-                            TranslatableCaption.of("economy.removed_balance"),
+                };
-                            TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
+                if (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::get
                     );
+                } else {
+                    return run.get();
                 }
-                player.sendMessage(TranslatableCaption.of("merge.success_merge"));
+                // find first
-                eventDispatcher.callPostMerge(player, plot);
+                break;
-            };
-            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) {

Core/src/main/java/com/plotsquared/core/configuration/Settings.java

@@ -435,6 +435,11 @@ public class Settings extends Config {
 
         public static String SCHEMATICS = "schematics";
         public static String TEMPLATES = "templates";
+        @Comment({"If schematics used for generation should be searched for in the path.schematics location",
+                " - This setting exists and is `false` by default for backwards compatibility.",
+                " - If false then generation schematics must be located in `schematics`",
+                " - Schematics must still always be under GEN_ROAD_SCHEMATIC/<world> etc."})
+        public static boolean USE_SCHEMATICS_PATH_FOR_GEN_SCHEMATICS = false;
 
     }
 

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

@@ -140,7 +140,8 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     @NonNull
     @Override
     protected PlotManager createManager() {
-        return new HybridPlotManager(this, PlotSquared.platform().regionManager(),
+        return new HybridPlotManager(
+                this, PlotSquared.platform().regionManager(),
                 PlotSquared.platform().injector().getInstance(ProgressSubscriberFactory.class)
         );
     }
@@ -215,15 +216,16 @@ public class HybridPlotWorld extends ClassicPlotWorld {
 
         // Try to determine root. This means that plot areas can have separate schematic
         // directories
+        String schematicFolder = Settings.Paths.USE_SCHEMATICS_PATH_FOR_GEN_SCHEMATICS ? Settings.Paths.SCHEMATICS : "schematics";
         if (!(root =
                 FileUtils.getFile(
                         PlotSquared.platform().getDirectory(),
-                        "schematics/GEN_ROAD_SCHEMATIC/" + this.getWorldName() + "/" + this.getId()
+                        schematicFolder + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + this.getWorldName() + File.separator + this.getId()
                 ))
                 .exists()) {
             root = FileUtils.getFile(
                     PlotSquared.platform().getDirectory(),
-                    "schematics/GEN_ROAD_SCHEMATIC/" + this.getWorldName()
+                    schematicFolder + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + this.getWorldName()
             );
         }
 

Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java

@@ -355,7 +355,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
     /**
      * {@return the world name at the player's contextual position}
      * The contextual position can be affected when using a command with
-     * an explicit plot override, e.g., `/plot &ltid&gt info`.
+     * an explicit plot override, e.g., {@code /plot <id> info}.
      */
     private @NonNull String getContextualWorldName() {
         Plot current = getCurrentPlot();
@@ -368,9 +368,9 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
     /**
      * {@return the plot area at the player's contextual position}
      * The contextual position can be affected when using a command with
-     * an explicit plot override, e.g., `/plot &ltid&gt info`.
+     * an explicit plot override, e.g., {@code /plot <id> info}.
      *
-     * @since TODO
+     * @since 7.5.9
      */
     public @Nullable PlotArea getContextualPlotArea() {
         Plot current = getCurrentPlot();

Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java

@@ -204,6 +204,9 @@ public final class PlaceholderRegistry {
         this.createPlaceholder("currentplot_x", (player, plot) -> Integer.toString(plot.getId().getX()));
         this.createPlaceholder("currentplot_y", (player, plot) -> Integer.toString(plot.getId().getY()));
         this.createPlaceholder("currentplot_xy", (player, plot) -> plot.getId().toString());
+        this.createPlaceholder("currentplot_abs_x", (player, plot) -> Integer.toString(plot.getId().getX()), true);
+        this.createPlaceholder("currentplot_abs_y", (player, plot) -> Integer.toString(plot.getId().getY()), true);
+        this.createPlaceholder("currentplot_abs_xy", (player, plot) -> plot.getId().toString(), true);
         this.createPlaceholder("currentplot_rating", (player, plot) -> {
             if (Double.isNaN(plot.getAverageRating())) {
                 return legacyComponent(TranslatableCaption.of("placeholder.nan"), player);
@@ -253,7 +256,23 @@ public final class PlaceholderRegistry {
             final @NonNull String key,
             final @NonNull BiFunction<PlotPlayer<?>, Plot, String> placeholderFunction
     ) {
-        this.registerPlaceholder(new PlotSpecificPlaceholder(key) {
+        this.createPlaceholder(key, placeholderFunction, false);
+    }
+
+    /**
+     * Create a functional placeholder
+     *
+     * @param key                 Placeholder key
+     * @param placeholderFunction Placeholder generator. Cannot return null
+     * @param requireAbsolute     If the plot given to the placeholder should be the absolute (not base) plot
+     * @since 7.5.9
+     */
+    public void createPlaceholder(
+            final @NonNull String key,
+            final @NonNull BiFunction<PlotPlayer<?>, Plot, String> placeholderFunction,
+            final boolean requireAbsolute
+    ) {
+        this.registerPlaceholder(new PlotSpecificPlaceholder(key, requireAbsolute) {
             @Override
             public @NonNull String getValue(final @NonNull PlotPlayer<?> player, final @NonNull Plot plot) {
                 return placeholderFunction.apply(player, plot);

Core/src/main/java/com/plotsquared/core/util/placeholders/PlotSpecificPlaceholder.java

@@ -27,14 +27,28 @@ import org.checkerframework.checker.nullness.qual.NonNull;
  */
 public abstract class PlotSpecificPlaceholder extends Placeholder {
 
+    private final boolean requireAbsolute;
+
     public PlotSpecificPlaceholder(final @NonNull String key) {
+        this(key, false);
+    }
+
+    /**
+     * Create a functional placeholder
+     *
+     * @param key             Placeholder key
+     * @param requireAbsolute If the plot given to the placeholder should be the absolute (not base) plot
+     * @since 7.5.9
+     */
+    public PlotSpecificPlaceholder(final @NonNull String key, final boolean requireAbsolute) {
         super(key);
+        this.requireAbsolute = requireAbsolute;
     }
 
     @Override
     public @NonNull
     final String getValue(final @NonNull PlotPlayer<?> player) {
-        final Plot plot = player.getCurrentPlot();
+        final Plot plot = requireAbsolute ? player.getLocation().getPlotAbs() : player.getCurrentPlot();
         if (plot == null) {
             return "";
         }

build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.5.9-SNAPSHOT"
+version = "7.5.11-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""
@@ -73,8 +73,8 @@ subprojects {
 
     dependencies {
         // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:6.0.0")
+        testImplementation("org.junit.jupiter:junit-jupiter:6.0.1")
-        testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.0")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.1")
     }
 
     plugins.withId("java") {

gradle/libs.versions.toml

@@ -3,7 +3,7 @@
 paper = "1.20.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
 spotbugs = "4.9.8"
-checkerqual = "3.51.1"
+checkerqual = "3.52.0"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
@@ -14,7 +14,7 @@ log4j = "2.19.0"
 # Plugins
 worldedit = "7.2.20"
 fawe = "2.14.0"
-placeholderapi = "2.11.6"
+placeholderapi = "2.11.7"
 luckperms = "5.5"
 essentialsx = "2.21.2"
 mvdwapi = "3.1.1"
@@ -35,8 +35,8 @@ serverlib = "2.3.7"
 # Gradle plugins
 shadow = "9.2.2"
 grgit = "4.1.1"
-spotless = "8.0.0"
+spotless = "8.1.0"
-publish = "0.34.0"
+publish = "0.35.0"
 runPaper = "3.0.2"
 
 [libraries]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME