From 372ed246ceb858d39a0d6eda296a623ec3ab1407 Mon Sep 17 00:00:00 2001
From: Warrior <50800980+Warriorrrr@users.noreply.github.com>
Date: Thu, 4 Aug 2022 19:59:30 +0200
Subject: [PATCH] Add /t & /n deposit all

---
 .../palmergames/bukkit/towny/command/NationCommand.java  | 9 ++++-----
 .../palmergames/bukkit/towny/command/TownCommand.java    | 6 +++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/com/palmergames/bukkit/towny/command/NationCommand.java b/src/com/palmergames/bukkit/towny/command/NationCommand.java
index 7f362dde9c..b8fa5e78a8 100644
--- a/src/com/palmergames/bukkit/towny/command/NationCommand.java
+++ b/src/com/palmergames/bukkit/towny/command/NationCommand.java
@@ -2572,11 +2572,10 @@ private static void nationTransaction(Player player, String[] args, boolean with
 				throw new TownyException(Translatable.of("msg_must_specify_amnt", "/nation" + (withdraw ? " withdraw" : " deposit")));
 
 			int amount;
-			try {
-				amount = Integer.parseInt(args[1].trim());
-			} catch (NumberFormatException ex) {
-				throw new TownyException(Translatable.of("msg_error_must_be_int"));
-			}
+			if ("all".equalsIgnoreCase(args[1].trim()))
+				amount = (int) Math.floor(withdraw ? nation.getAccount().getHoldingBalance() : resident.getAccount().getHoldingBalance());
+			else 
+				amount = MathUtil.getIntOrThrow(args[1].trim());
 			
 			if (args.length == 2) {
 				if (withdraw)
diff --git a/src/com/palmergames/bukkit/towny/command/TownCommand.java b/src/com/palmergames/bukkit/towny/command/TownCommand.java
index a173842809..b539433aeb 100644
--- a/src/com/palmergames/bukkit/towny/command/TownCommand.java
+++ b/src/com/palmergames/bukkit/towny/command/TownCommand.java
@@ -4150,7 +4150,11 @@ private static void townTransaction(Player player, String[] args, boolean withdr
 				throw new TownyException(Translatable.of("msg_err_dont_belong_town"));
 			
 			if (args.length == 2) {
-				int amount = MathUtil.getIntOrThrow(args[1].trim());
+				int amount;
+				if ("all".equalsIgnoreCase(args[1].trim()))
+					amount = (int) Math.floor(withdraw ? resident.getTown().getAccount().getHoldingBalance() : resident.getAccount().getHoldingBalance());
+				else
+					amount = MathUtil.getIntOrThrow(args[1].trim());
 
 				if (withdraw)
 					MoneyUtil.townWithdraw(player, resident, resident.getTown(), amount);