From 7cb997edceae492c6a75b75b54fc1f8973328d4b Mon Sep 17 00:00:00 2001 From: Silverwolfg11 Date: Thu, 6 Aug 2020 18:14:38 -0700 Subject: [PATCH] Fix taxes being below 0. --- .../bukkit/towny/object/Government.java | 2 +- .../palmergames/bukkit/towny/object/Town.java | 17 ++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/com/palmergames/bukkit/towny/object/Government.java b/src/com/palmergames/bukkit/towny/object/Government.java index 0ac4dc2319..6eb74f50e3 100644 --- a/src/com/palmergames/bukkit/towny/object/Government.java +++ b/src/com/palmergames/bukkit/towny/object/Government.java @@ -38,7 +38,7 @@ public abstract class Government extends TownyObject implements BankEconomyHandl private boolean isOpen = false; private long registered; private double spawnCost = TownySettings.getSpawnTravelCost(); - protected double taxes = -1; + protected double taxes; private final AccountAuditor accountAuditor = new GovernmentAccountAuditor(); protected Government(String name) { diff --git a/src/com/palmergames/bukkit/towny/object/Town.java b/src/com/palmergames/bukkit/towny/object/Town.java index d9bf42459e..d023433b02 100644 --- a/src/com/palmergames/bukkit/towny/object/Town.java +++ b/src/com/palmergames/bukkit/towny/object/Town.java @@ -66,6 +66,7 @@ public Town(String name) { permissions.loadDefault(this); // Set defaults. + setTaxes(TownySettings.getTownDefaultTax()); setOpen(TownySettings.getTownDefaultOpen()); setBoard(TownySettings.getTownDefaultBoard()); } @@ -116,17 +117,11 @@ public Resident getMayor() { } public void setTaxes(double taxes) { - if (isTaxPercentage) { - this.taxes = Math.min(taxes, TownySettings.getMaxTownTaxPercent()); - } else { - this.taxes = Math.min(taxes, TownySettings.getMaxTownTax()); - } - } - - @Override - public double getTaxes() { - setTaxes(taxes); - return taxes == -1 ? TownySettings.getTownDefaultTax() : taxes; + this.taxes = Math.min(taxes, isTaxPercentage ? TownySettings.getMaxTownTaxPercent() : TownySettings.getMaxTownTax()); + + // Fix invalid taxes + if (this.taxes < 0) + this.taxes = TownySettings.getTownDefaultTax(); } public void setMayor(Resident mayor) throws TownyException {