From 0a15e95fd79709a9ab54b59410847a6becb006db Mon Sep 17 00:00:00 2001 From: RedstoneFX Date: Wed, 30 Jul 2025 10:32:49 +0300 Subject: [PATCH 1/4] Update PlaceholderAPI dependency (old is no longer avaliable) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2ed533d..674e43e 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ me.clip placeholderapi - 2.10.10 + 2.11.5 provided From f67ab4c70eed377aa70226af7341437dc6fa5d4d Mon Sep 17 00:00:00 2001 From: RedstoneFX Date: Wed, 30 Jul 2025 10:33:14 +0300 Subject: [PATCH 2/4] Check withdraw value to be positive --- .../tk/taverncraft/quicktax/commands/WithdrawCommand.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/tk/taverncraft/quicktax/commands/WithdrawCommand.java b/src/main/java/tk/taverncraft/quicktax/commands/WithdrawCommand.java index 2f12fbb..2855655 100644 --- a/src/main/java/tk/taverncraft/quicktax/commands/WithdrawCommand.java +++ b/src/main/java/tk/taverncraft/quicktax/commands/WithdrawCommand.java @@ -59,6 +59,10 @@ public boolean withdrawForSelf(CommandSender sender, String strAmount) { double amount = Double.parseDouble(strAmount); + if(amount <= 0) { + MessageManager.sendMessage(sender,"tax-withdraw-fail-invalid"); + } + try { double totalTaxBalance = Double.parseDouble(this.main.getStatsManager().getServerStats()[1]); if (validationManager.serverHasTaxBalance(amount, totalTaxBalance)) { From c2093a1399d3e9eed27b4420ce212192ce595e80 Mon Sep 17 00:00:00 2001 From: RedstoneFX Date: Wed, 30 Jul 2025 10:41:00 +0300 Subject: [PATCH 3/4] Prevent function from execution if withdraw amout is negative --- .../java/tk/taverncraft/quicktax/commands/WithdrawCommand.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/tk/taverncraft/quicktax/commands/WithdrawCommand.java b/src/main/java/tk/taverncraft/quicktax/commands/WithdrawCommand.java index 2855655..624340a 100644 --- a/src/main/java/tk/taverncraft/quicktax/commands/WithdrawCommand.java +++ b/src/main/java/tk/taverncraft/quicktax/commands/WithdrawCommand.java @@ -61,6 +61,7 @@ public boolean withdrawForSelf(CommandSender sender, String strAmount) { if(amount <= 0) { MessageManager.sendMessage(sender,"tax-withdraw-fail-invalid"); + return false; } try { From 25d60617002f74b6bd0493a4d8faf3edb58f7517 Mon Sep 17 00:00:00 2001 From: RedstoneFX Date: Wed, 30 Jul 2025 10:43:27 +0300 Subject: [PATCH 4/4] Language support for tax witdraw value check --- src/main/resources/en.yml | 1 + src/main/resources/es.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/resources/en.yml b/src/main/resources/en.yml index 3013c7a..9a6ae60 100644 --- a/src/main/resources/en.yml +++ b/src/main/resources/en.yml @@ -29,6 +29,7 @@ tax-collect-success-bal: '&aTaxes collected for players by balance!' tax-collect-success-activity: '&aTaxes collected for players by activity!' tax-withdraw-success: '&aBalance withdrawn successfully!' tax-withdraw-fail: '&cThere is insufficient server tax balance!' +tax-withdraw-fail-invalid: '&cCannot withdraw negative or zero current from balance!' tax-collect-fail-individual: '&b%player% &chas no money to pay tax!' # %player% tax-collect-already-running: '&cAn existing tax collection is ongoing, please try again later!' tax-exempt: '&cThe player &b%player% &cis exempted from your tax collection!' diff --git a/src/main/resources/es.yml b/src/main/resources/es.yml index 2b64dc0..facf4a6 100644 --- a/src/main/resources/es.yml +++ b/src/main/resources/es.yml @@ -25,6 +25,7 @@ tax-collect-success-rank: '&a¡Impuestos Recaudados de todos los jugadores por r tax-collect-success-bal: '¡Impuestos Recaudados de todos los jugadores por dinero!' tax-withdraw-success: '&aFondos retirados de la cuenta del Servidor!' tax-withdraw-fail: '&cFondos insuficientes. La cuenta del Servidor no tiene ese saldo de impuestos para retirar!' +tax-withdraw-fail-invalid: '&cNo puede retirar corriente negativa o cero del saldo!' tax-collect-fail-individual: '&b%player% &cno tiene dinero para pagar sus impuestos!' # %player% tax-collect-already-running: '&cHay una recaudación de impuestos en curso. Vuelva a intentarlo más tarde!' player-pay-tax-fail: '&cTienes dinero insuficiente para pagar tus impuestos!' # %player%