Upstream/QuickTax
1
0
Fork 1
mirror of https://github.com/tjtanjin/QuickTax.git synced 2024-11-26 06:45:11 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Fix an issue where claimblocks were not calculated properly

Browse Source
This commit is contained in:
tjtanjin 2024-02-03 00:56:46 +08:00
parent 4f0c0b61ae
commit ae1b9cf95e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -7,7 +7,7 @@
<groupId>quicktax</groupId>
<artifactId>quicktax</artifactId>
<version>1.6.0</version>
<version>1.7.0</version>
<name>QuickTax</name>

9
src/main/java/tk/taverncraft/quicktax/utils/TaxManager.java
View File

@ -376,11 +376,12 @@ public class TaxManager {
try {
PlayerData playerData = GriefPrevention.instance.dataStore.getPlayerData(player.getUniqueId());
double totalClaims = playerData.getAccruedClaimBlocks() + playerData.getBonusClaimBlocks();
double playerClaims;
if (main.getConfig().getBoolean("active-claims-only", false)) {
playerClaims = playerData.getAccruedClaimBlocks() - playerData.getRemainingClaimBlocks();
playerClaims = totalClaims - playerData.getRemainingClaimBlocks();
} else {
playerClaims = playerData.getAccruedClaimBlocks();
playerClaims = totalClaims;
}
subtractAmount = getSubtractAmountWithClaims(player, usePercentage, balTaxAmount, playerBal, claimsTaxAmount, playerClaims);
} catch (NoClassDefFoundError e) {
@ -403,7 +404,7 @@ public class TaxManager {
}
MessageManager.sendMessage(player.getPlayer(), "player-pay-tax-success",
new String[]{"%player%", "%amount%"},
new String[]{player.getName(), String.valueOf(subtractAmount)});
new String[]{player.getName(), new BigDecimal(subtractAmount).setScale(2, RoundingMode.HALF_UP).toPlainString()});
}
// needed in rare situations where async access to economy plugin is disallowed
@ -462,7 +463,7 @@ public class TaxManager {
}
MessageManager.sendMessage(player.getPlayer(), "player-pay-tax-success",
new String[]{"%player%", "%amount%"},
new String[]{player.getName(), String.valueOf(subtractAmount)});
new String[]{player.getName(), new BigDecimal(subtractAmount).setScale(2, RoundingMode.HALF_UP).toPlainString()});
}
// needed in rare situations where async access to economy plugin is disallowed