1 files changed, 22 insertions, 119 deletions

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
index 8392d4759..c003d28ac 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
@@ -1,14 +1,9 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import com.earth2me.essentials.*;
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
 import java.util.*;
-import org.bukkit.Material;
 import org.bukkit.Server;
-import org.bukkit.inventory.ItemStack;
 
 
 public class Commandkit extends EssentialsCommand
@@ -23,131 +18,39 @@ public class Commandkit extends EssentialsCommand
 	{
 		if (args.length < 1)
 		{
-			try
+			final String kitList = Kit.listKits(ess, user);
+			if (kitList.length() > 0)
 			{
-				final Map<String, Object> kits = ess.getSettings().getKits();
-				final StringBuilder list = new StringBuilder();
-				for (String kiteItem : kits.keySet())
-				{
-					if (user.isAuthorized("essentials.kit." + kiteItem.toLowerCase(Locale.ENGLISH)))
-					{
-						list.append(" ").append(kiteItem);
-					}
-				}
-				if (list.length() > 0)
-				{
-					user.sendMessage(_("kits", list.toString()));
-				}
-				else
-				{
-					user.sendMessage(_("noKits"));
-				}
+				user.sendMessage(_("kits", kitList));
 			}
-			catch (Exception ex)
+			else
 			{
-				user.sendMessage(_("kitError"));
+				user.sendMessage(_("noKits"));
 			}
+			throw new NoChargeException();
 		}
 		else
 		{
-			try
-			{
-				final String kitName = args[0].toLowerCase(Locale.ENGLISH);
-				final Object kit = ess.getSettings().getKit(kitName);
-				List<String> items;
-
-				if (!user.isAuthorized("essentials.kit." + kitName))
-				{
-					user.sendMessage(_("noKitPermission", "essentials.kit." + kitName));
-					return;
-				}
+			final String kitName = args[0].toLowerCase(Locale.ENGLISH);
+			final Object kit = ess.getSettings().getKit(kitName);
 
-				try
-				{
-
-					//System.out.println("Kit is timed");
-					final Map<String, Object> els = (Map<String, Object>)kit;
-					items = (List<String>)els.get("items");
-					final double delay = els.containsKey("delay") ? ((Number)els.get("delay")).doubleValue() : 0L;
-					final Calendar c = new GregorianCalendar();
-					c.add(Calendar.SECOND, -(int)delay);
-					c.add(Calendar.MILLISECOND, -(int)((delay * 1000.0) % 1000.0));
+			if (!user.isAuthorized("essentials.kit." + kitName))
+			{
+				throw new Exception(_("noKitPermission", "essentials.kit." + kitName));
+			}
+			final Map<String, Object> els = (Map<String, Object>)kit;
+			final List<String> items = Kit.getItems(user, els);
 
-					final long mintime = c.getTimeInMillis();
+			Kit.checkTime(user, kitName, els);
 
-					final Long lastTime = user.getKitTimestamp(kitName);
-					if (lastTime == null || lastTime < mintime)
-					{
-						final Calendar now = new GregorianCalendar();
-						user.setKitTimestamp(kitName, now.getTimeInMillis());
-					}
-					else
-					{
-						final Calendar future = new GregorianCalendar();
-						future.setTimeInMillis(lastTime);
-						future.add(Calendar.SECOND, (int)delay);
-						future.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
-						user.sendMessage(_("kitTimed", Util.formatDateDiff(future.getTimeInMillis())));
-						return;
-					}
-				}
-				catch (Exception ex)
-				{
-					items = (List<String>)kit;
-				}
+			final Trade charge = new Trade("kit-" + kitName, ess);
+			charge.isAffordableFor(user);
 
-				final Trade charge = new Trade("kit-" + kitName, ess);
-				try
-				{
-					charge.isAffordableFor(user);
-				}
-				catch (Exception ex)
-				{
-					user.sendMessage(ex.getMessage());
-					return;
-				}
+			Kit.expandItems(ess, user, items);
+			
+			charge.charge(user);
+			user.sendMessage(_("kitGive", kitName));
 
-				boolean spew = false;
-				for (String d : items)
-				{
-					final String[] parts = d.split("[^0-9]+", 3);
-					final int id = Material.getMaterial(Integer.parseInt(parts[0])).getId();
-					final int amount = parts.length > 1 ? Integer.parseInt(parts[parts.length > 2 ? 2 : 1]) : 1;
-					final short data = parts.length > 2 ? Short.parseShort(parts[1]) : 0;
-					final Map<Integer, ItemStack> overfilled;
-					if (user.isAuthorized("essentials.oversizedstacks"))
-					{
-						overfilled = InventoryWorkaround.addItem(user.getInventory(), true, ess.getSettings().getOversizedStackSize(), new ItemStack(id, amount, data));
-					}
-					else
-					{
-						overfilled = InventoryWorkaround.addItem(user.getInventory(), true, new ItemStack(id, amount, data));
-					}
-					for (ItemStack itemStack : overfilled.values())
-					{
-						user.getWorld().dropItemNaturally(user.getLocation(), itemStack);
-						spew = true;
-					}
-				}
-				if (spew)
-				{
-					user.sendMessage(_("kitInvFull"));
-				}
-				try
-				{
-					charge.charge(user);
-				}
-				catch (Exception ex)
-				{
-					user.sendMessage(ex.getMessage());
-				}
-				user.sendMessage(_("kitGive", kitName));
-			}
-			catch (Exception ex)
-			{
-				user.sendMessage(_("kitError2"));
-				user.sendMessage(_("kitErrorHelp"));
-			}
 		}
 	}
 }