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 diff --git a/src/main/java/tk/taverncraft/quicktax/commands/WithdrawCommand.java b/src/main/java/tk/taverncraft/quicktax/commands/WithdrawCommand.java index 2f12fbb..624340a 100644 --- a/src/main/java/tk/taverncraft/quicktax/commands/WithdrawCommand.java +++ b/src/main/java/tk/taverncraft/quicktax/commands/WithdrawCommand.java @@ -59,6 +59,11 @@ public boolean withdrawForSelf(CommandSender sender, String strAmount) { double amount = Double.parseDouble(strAmount); + if(amount <= 0) { + MessageManager.sendMessage(sender,"tax-withdraw-fail-invalid"); + return false; + } + try { double totalTaxBalance = Double.parseDouble(this.main.getStatsManager().getServerStats()[1]); if (validationManager.serverHasTaxBalance(amount, totalTaxBalance)) { 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%