Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-19 09:06:09 +01:00
Code Issues Projects Releases Wiki Activity

Better handle kit item casting.

Browse Source
This commit is contained in:
KHobbits 2013-05-27 02:25:30 +01:00
parent 7fe83dbd91
commit 867bfbf1b8
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,21 +130,35 @@ public class Kit
} }
} }
public static List<String> getItems(final User user, final Map<String, Object> kit) throws Exception public static List<String> getItems(final IEssentials ess, final User user, final Map<String, Object> kit) throws Exception
{ {
if (kit == null) if (kit == null)
{ {
throw new Exception(_("kitNotFound")); throw new Exception(_("kitNotFound"));
} }
try try
{ {
return (List<String>)kit.get("items"); final List<String> itemList = new ArrayList<String>();
final Object kitItems = kit.get("items");
if (kitItems instanceof List)
{
for (Object item : (List)kitItems)
{
if (item instanceof String)
{
itemList.add(item.toString());
continue;
}
throw new Exception("Error parsing kit item: " + item.toString());
}
return itemList;
}
throw new Exception("Error parsing kit: " + kitItems.toString());
} }
catch (Exception e) catch (Exception e)
{ {
user.sendMessage(_("kitError2")); ess.getLogger().log(Level.WARNING, e.getMessage());
throw new Exception(_("kitErrorHelp"), e); throw new Exception(_("kitError2"), e);
} }
} }
@ -201,14 +215,7 @@ public class Kit
catch (Exception e) catch (Exception e)
{ {
user.updateInventory(); user.updateInventory();
if (ess.getSettings().isDebug()) ess.getLogger().log(Level.WARNING, e.getMessage());
{
ess.getLogger().log(Level.WARNING, e.getMessage());
}
else
{
ess.getLogger().log(Level.WARNING, e.getMessage());
}
throw new Exception(_("kitError2"), e); 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 String kitName = args[0].toLowerCase(Locale.ENGLISH);
final Map<String, Object> kit = ess.getSettings().getKit(kitName); final Map<String, Object> kit = ess.getSettings().getKit(kitName);
final List<String> items = Kit.getItems(userTo, kit); final List<String> items = Kit.getItems(ess, userTo, kit);
Kit.expandItems(ess, userTo, items); Kit.expandItems(ess, userTo, items);
sender.sendMessage(_("kitGiveTo", kitName, userTo.getDisplayName())); sender.sendMessage(_("kitGiveTo", kitName, userTo.getDisplayName()));
@ -78,7 +78,7 @@ public class Commandkit extends EssentialsCommand
throw new Exception(_("noKitPermission", "essentials.kits." + kitName)); throw new Exception(_("noKitPermission", "essentials.kits." + kitName));
} }
final List<String> items = Kit.getItems(userTo, kit); final List<String> items = Kit.getItems(ess, userTo, kit);
Kit.checkTime(userFrom, kitName, kit); Kit.checkTime(userFrom, kitName, kit);

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

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