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

fix: Don't charge for auto merge if there is no auto merge
2025-07-23 07:40:28 +02:00 · 2023-01-21 16:39:46 +01:00 · 2022-12-19 20:55:11 +01:00 · 2022-12-18 11:00:47 +00:00 · 2022-10-09 15:27:35 +01:00
1 changed files with 4 additions and 1 deletions
--- a/Core/src/main/java/com/plotsquared/core/command/Auto.java
+++ b/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"));
Author	SHA1	Message	Date
Alexander Brandes	ae340aeb2a	Merge branch 'v6' into feature/v6/auto-merge-merge-cost	2023-01-21 16:39:46 +01:00
Alexander Brandes	49be6c0bb9	Merge branch 'v6' into feature/v6/auto-merge-merge-cost	2022-12-19 20:55:11 +01:00
dordsor21	c15e1c066d	fix: Don't charge for auto merge if there is no auto merge	2022-12-18 11:00:47 +00:00
dordsor21	35dd4899b9	feat: add cost for the merge when using plot auto-merge - Closes #3814	2022-10-09 15:27:35 +01:00