1 files changed, 18 insertions, 13 deletions

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
index c8abd6a81..e7fe62f22 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
@@ -1,12 +1,12 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Kit;
+import com.earth2me.essentials.Kits;
 import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.Util;
 import com.earth2me.essentials.api.IUser;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import com.earth2me.essentials.settings.Kit;
+import java.util.*;
 
 
 public class Commandkit extends EssentialsCommand
@@ -16,35 +16,40 @@ public class Commandkit extends EssentialsCommand
 	{
 		if (args.length < 1)
 		{
-			final String kitList = Kit.listKits(ess, user);
-			if (kitList.length() > 0)
+			Collection<String> kitList = ess.getKits().getList();
+			if (kitList.isEmpty())
 			{
-				user.sendMessage(_("kits", kitList));
+				user.sendMessage(_("noKits"));
 			}
 			else
 			{
-				user.sendMessage(_("noKits"));
+				for (String kitName : kitList)
+				{
+					if (!user.isAuthorized("essentials.kit." + kitName))
+					{
+						kitList.remove(kitName);
+					}
+				}
+				user.sendMessage(_("kits", Util.joinList(kitList)));
 			}
 			throw new NoChargeException();
 		}
 		else
 		{
 			final String kitName = args[0].toLowerCase(Locale.ENGLISH);
-			final Object kit = ess.getSettings().getKit(kitName);
+			final Kit kit = ess.getKits().getKit(kitName);
 
 			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);
 
-			Kit.checkTime(user, kitName, els);
+			//TODO: Check kit delay
 
 			final Trade charge = new Trade("kit-" + kitName, ess);
 			charge.isAffordableFor(user);
 
-			Kit.expandItems(ess, user, items);
+			ess.getKits().sendKit(user, kit);
 
 			charge.charge(user);
 			user.sendMessage(_("kitGive", kitName));