Correctly implement charges in /more all

1 files changed, 48 insertions, 14 deletions

diff --git a/Essentials/src/net/ess3/commands/Commandmore.java b/Essentials/src/net/ess3/commands/Commandmore.java
index 26c7d7de3..587852c29 100644
--- a/Essentials/src/net/ess3/commands/Commandmore.java
+++ b/Essentials/src/net/ess3/commands/Commandmore.java
@@ -2,8 +2,10 @@ package net.ess3.commands;
 
 import java.util.Locale;
 import static net.ess3.I18n._;
+import net.ess3.api.ChargeException;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
+import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
 import org.bukkit.inventory.ItemStack;
 
@@ -29,37 +31,69 @@ public class Commandmore extends EssentialsCommand
 		{
 			if (stack == null)
 			{
-				throw new Exception(_("cantSpawnItem", "Air"));
+				if (stacks.length == 1)
+				{
+					throw new Exception(_("cantSpawnItem", "Air"));
+				}
+				else
+				{
+					continue;
+				}
 			}
 			ISettings settings = ess.getSettings();
-			
+
 			int defaultStackSize = settings.getData().getGeneral().getDefaultStacksize();
 			int oversizedStackSize = settings.getData().getGeneral().getOversizedStacksize();
-			
-			if (stack.getAmount() >= (Permissions.OVERSIZEDSTACKS.isAuthorized(user)
-									  ? oversizedStackSize
-									  : defaultStackSize > 0 ? defaultStackSize : stack.getMaxStackSize()))
+
+			int newAmount = Permissions.OVERSIZEDSTACKS.isAuthorized(user)
+							? oversizedStackSize
+							: defaultStackSize > 0 ? defaultStackSize : stack.getMaxStackSize();
+			if (stack.getAmount() >= newAmount)
 			{
-				throw new NoChargeException();
+				if (stacks.length == 1)
+				{
+					throw new NoChargeException();
+				}
+				else
+				{
+					continue;
+				}
 			}
 			final String itemname = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
 			if (!Permissions.ITEMSPAWN.isAuthorized(user, stack))
 			{
-				throw new Exception(_("cantSpawnItem", itemname));
-			}
-			if (Permissions.OVERSIZEDSTACKS.isAuthorized(user))
-			{
-				stack.setAmount(oversizedStackSize);
+				if (stacks.length == 1)
+				{
+					throw new Exception(_("cantSpawnItem", itemname));
+				}
+				else
+				{
+					continue;
+				}
 			}
-			else
+			if (stack.getAmount() < newAmount && stacks.length > 1)
 			{
-				stack.setAmount(defaultStackSize > 0 ? defaultStackSize : stack.getMaxStackSize());
+				Trade trade = new Trade("more", ess);
+				try
+				{
+					trade.charge(user);
+				}
+				catch (ChargeException ex)
+				{
+					user.sendMessage(ex.getMessage());
+					break;
+				}
 			}
+			stack.setAmount(newAmount);
 		}
 		if (stacks.length > 1)
 		{
 			user.getPlayer().getInventory().setContents(stacks);
 		}
 		user.getPlayer().updateInventory();
+		if (stacks.length > 1)
+		{
+			throw new NoChargeException();
+		}
 	}
 }