From c15e1c066d64ac7f53dfed389224cc882bbf86d8 Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Sun, 18 Dec 2022 11:00:47 +0000 Subject: [PATCH] fix: Don't charge for auto merge if there is no auto merge --- Core/src/main/java/com/plotsquared/core/command/Auto.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Core/src/main/java/com/plotsquared/core/command/Auto.java b/Core/src/main/java/com/plotsquared/core/command/Auto.java index 4b37d237d..65b50f909 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Auto.java +++ b/Core/src/main/java/com/plotsquared/core/command/Auto.java @@ -294,11 +294,12 @@ public class Auto extends SubCommand { if (this.econHandler != null && plotarea.useEconomy()) { PlotExpression costExp = plotarea.getPrices().get("claim"); PlotExpression mergeCostExp = plotarea.getPrices().get("merge"); - double mergeCost = mergeCostExp == null ? 0d : mergeCostExp.evaluate(sizeX * sizeZ); + 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 + mergeCost; + cost = size * cost + mergeCost; if (cost > 0d) { if (!this.econHandler.isSupported()) { player.sendMessage(TranslatableCaption.of("economy.vault_or_consumer_null"));