Upstream
/
Essentials
mirror of https://github.com/EssentialsX/Essentials.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clarify kit errors

This commit is contained in:
KHobbits 2013-09-05 15:26:33 +01:00
parent 0926da3782
commit 0a17489c9c
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Essentials/src/com/earth2me/essentials/Kit.java
View File

@ -133,7 +133,7 @@ public class Kit
}
}
public static List<String> getItems(final IEssentials ess, final User user, final Map<String, Object> kit) throws Exception
public static List<String> getItems(final IEssentials ess, final User user, final String kitName, final Map<String, Object> kit) throws Exception
{
if (kit == null)
{
@ -152,15 +152,15 @@ public class Kit
itemList.add(item.toString());
continue;
}
throw new Exception("Error parsing kit item: " + item.toString());
throw new Exception("Invalid kit item: " + item.toString());
}
return itemList;
}
throw new Exception("Error parsing kit: " + kitItems.toString());
throw new Exception("Invalid item list");
}
catch (Exception e)
{
ess.getLogger().log(Level.WARNING, e.getMessage());
ess.getLogger().log(Level.WARNING, "Error parsing kit " + kitName + ": " + e.getMessage());
throw new Exception(_("kitError2"), e);
}
}

4
Essentials/src/com/earth2me/essentials/commands/Commandkit.java
View File

@ -56,7 +56,7 @@ public class Commandkit extends EssentialsCommand
final String kitName = args[0].toLowerCase(Locale.ENGLISH);
final Map<String, Object> kit = ess.getSettings().getKit(kitName);
final List<String> items = Kit.getItems(ess, userTo, kit);
final List<String> items = Kit.getItems(ess, userTo, kitName, kit);
Kit.expandItems(ess, userTo, items);
sender.sendMessage(_("kitGiveTo", kitName, userTo.getDisplayName()));
@ -78,7 +78,7 @@ public class Commandkit extends EssentialsCommand
throw new Exception(_("noKitPermission", "essentials.kits." + kitName));
}
final List<String> items = Kit.getItems(ess, userTo, kit);
final List<String> items = Kit.getItems(ess, userTo, kitName, kit);
Kit.checkTime(userFrom, kitName, kit);

2
Essentials/src/com/earth2me/essentials/signs/SignKit.java
View File

@ -61,7 +61,7 @@ public class SignKit extends EssentialsSign
{
final Map<String, Object> kit = ess.getSettings().getKit(kitName);
Kit.checkTime(player, kitName, kit);
final List<String> items = Kit.getItems(ess, player, kit);
final List<String> items = Kit.getItems(ess, player, kitName, kit);
Kit.expandItems(ess, player, items);
charge.charge(player);
Trade.log("Sign", "Kit", "Interact", username, null, username, charge, sign.getBlock().getLocation(), ess);

2
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
View File

@ -123,7 +123,7 @@ public class EssentialsSpawnPlayerListener implements Listener
try
{
final Map<String, Object> kit = ess.getSettings().getKit(kitName.toLowerCase(Locale.ENGLISH));
final List<String> items = Kit.getItems(ess, user, kit);
final List<String> items = Kit.getItems(ess, user, kitName, kit);
Kit.expandItems(ess, user, items);
}
catch (Exception ex)