1 files changed, 36 insertions, 28 deletions

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java b/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java
index 1540e049c..a5df6bee6 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java
@@ -1,6 +1,5 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.Essentials;
 import com.earth2me.essentials.InventoryWorkaround;
 import com.earth2me.essentials.ItemDb;
 import com.earth2me.essentials.User;
@@ -10,6 +9,7 @@ import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.inventory.ItemStack;
 
+
 public class Commandunlimited extends EssentialsCommand
 {
 	public Commandunlimited()
@@ -18,30 +18,34 @@ public class Commandunlimited extends EssentialsCommand
 	}
 
 	@Override
-	public void run(Server server, Essentials parent, User user, String commandLabel, String[] args) throws Exception
+	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
-			user.sendMessage("§cUsage: /" + commandLabel + " [list|item] <player>");
-			return;
+			throw new NotEnoughArgumentsException();
 		}
-		
+
 		User target = user;
-		
-		if (args.length > 1 && user.isAuthorized("essentials.unlimited.others")) {
+
+		if (args.length > 1 && user.isAuthorized("essentials.unlimited.others"))
+		{
 			target = getPlayer(server, args, 1);
 		}
-		
-		if (args[0].equalsIgnoreCase("list")) {
+
+		if (args[0].equalsIgnoreCase("list"))
+		{
 			StringBuilder sb = new StringBuilder();
 			sb.append("Unlimited items: ");
 			boolean first = true;
 			List<Integer> items = target.getUnlimited();
-			if (items.isEmpty()) {
+			if (items.isEmpty())
+			{
 				sb.append("none");
 			}
-			for (Integer integer : items) {
-				if (!first) {
+			for (Integer integer : items)
+			{
+				if (!first)
+				{
 					sb.append(", ");
 				}
 				first = false;
@@ -51,37 +55,41 @@ public class Commandunlimited extends EssentialsCommand
 			user.sendMessage(sb.toString());
 			return;
 		}
-		
+
 		ItemStack stack = ItemDb.get(args[0], 1);
-		
+
 		String itemname = stack.getType().toString().toLowerCase().replace("_", "");
-		if (!user.isAuthorized("essentials.unlimited.item-all") && 
-			!user.isAuthorized("essentials.unlimited.item-"+itemname) &&
-			!user.isAuthorized("essentials.unlimited.item-"+stack.getTypeId()) &&
-			!((stack.getType() == Material.WATER_BUCKET || stack.getType() == Material.LAVA_BUCKET) &&
-				user.isAuthorized("essentials.unlimited.item-bucket"))) {
-			user.sendMessage(ChatColor.RED + "No permission for unlimited item "+itemname+".");
+		if (!user.isAuthorized("essentials.unlimited.item-all")
+			&& !user.isAuthorized("essentials.unlimited.item-" + itemname)
+			&& !user.isAuthorized("essentials.unlimited.item-" + stack.getTypeId())
+			&& !((stack.getType() == Material.WATER_BUCKET || stack.getType() == Material.LAVA_BUCKET)
+				 && user.isAuthorized("essentials.unlimited.item-bucket")))
+		{
+			user.sendMessage(ChatColor.RED + "No permission for unlimited item " + itemname + ".");
 			return;
 		}
-		
-		
-		if (target.hasUnlimited(stack)) {
-			if (user != target) {
+
+
+		if (target.hasUnlimited(stack))
+		{
+			if (user != target)
+			{
 				user.sendMessage("§7Disable unlimited placing of " + itemname + " for " + target.getDisplayName() + ".");
 			}
 			target.sendMessage("§7Disable unlimited placing of " + itemname + " for " + target.getDisplayName() + ".");
 			target.setUnlimited(stack, false);
 			return;
 		}
-		user.charge(this);
-		if (user != target) {
+		charge(user);
+		if (user != target)
+		{
 			user.sendMessage("§7Giving unlimited amount of " + itemname + " to " + target.getDisplayName() + ".");
 		}
 		target.sendMessage("§7Giving unlimited amount of " + itemname + " to " + target.getDisplayName() + ".");
-		if (!InventoryWorkaround.containsItem(target.getInventory(), true, stack)) {
+		if (!InventoryWorkaround.containsItem(target.getInventory(), true, stack))
+		{
 			target.getInventory().addItem(stack);
 		}
 		target.setUnlimited(stack, true);
 	}
 }
-