Fix kits to only show to people who can use them.

1 files changed, 4 insertions, 15 deletions

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
index a545adf60..baa8ba014 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java
@@ -19,7 +19,8 @@ public class Commandkit extends EssentialsCommand
 	{
 		if (args.length < 1)
 		{
-			listKits(user);
+			final String kitList = Kit.listKits(ess, user);
+			user.sendMessage(kitList.length() > 0 ? _("kits", kitList) : _("noKits"));
 			throw new NoChargeException();
 		}
 		else if (args.length > 1 && user.isAuthorized("essentials.kit.others"))
@@ -40,7 +41,8 @@ public class Commandkit extends EssentialsCommand
 	{
 		if (args.length < 2)
 		{
-			listKits(sender);
+			final String kitList = Kit.listKits(ess, null);
+			sender.sendMessage(kitList.length() > 0 ? _("kits", kitList) : _("noKits"));
 			throw new NoChargeException();
 		}
 		else
@@ -56,19 +58,6 @@ public class Commandkit extends EssentialsCommand
 		}
 	}
 
-	private void listKits(CommandSender sender) throws Exception
-	{
-		final String kitList = Kit.listKits(ess, null);
-		if (kitList.length() > 0)
-		{
-			sender.sendMessage(_("kits", kitList));
-		}
-		else
-		{
-			sender.sendMessage(_("noKits"));
-		}
-	}
-
 	private void giveKit(User userTo, User userFrom, String kitName) throws Exception
 	{
 		final Map<String, Object> kit = ess.getSettings().getKit(kitName);