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

Catch NumberFormatException

Browse Source
This commit is contained in:
snowleo 2011-06-08 03:44:16 +02:00
parent e0597f2df1
commit dea44d7cbc
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
View File

@ -136,17 +136,24 @@ public class EssentialsSign
{
throw new SignException(Util.i18n("invalidCharge"));
}
final int quantity = Integer.parseInt(split[0]);
if (quantity <= 1)
try
{
throw new SignException(Util.i18n("moreThanZero"));
final int quantity = Integer.parseInt(split[0]);
if (quantity <= 1)
{
throw new SignException(Util.i18n("moreThanZero"));
}
final String item = split[1].toLowerCase();
if (!item.equalsIgnoreCase("times"))
{
getItemStack(item);
}
sign.setLine(index, quantity + " " + item);
}
final String item = split[1].toLowerCase();
if (!item.equalsIgnoreCase("times"))
catch (NumberFormatException ex)
{
getItemStack(item);
throw new SignException(Util.i18n("invalidCharge"), ex);
}
sign.setLine(index, quantity + " " + item);
}
}
@ -187,22 +194,29 @@ public class EssentialsSign
{
throw new SignException(Util.i18n("invalidCharge"));
}
final int quantity = Integer.parseInt(split[0]);
if (quantity <= 1)
try
{
throw new SignException(Util.i18n("moreThanZero"));
final int quantity = Integer.parseInt(split[0]);
if (quantity <= 1)
{
throw new SignException(Util.i18n("moreThanZero"));
}
final String item = split[1].toLowerCase();
if (item.equalsIgnoreCase("times"))
{
sign.setLine(index, (quantity - 1) + " times");
return new Charge(signName.toLowerCase() + "sign", ess);
}
else
{
final ItemStack stack = getItemStack(item);
stack.setAmount(quantity);
return new Charge(quantity, ess);
}
}
final String item = split[1].toLowerCase();
if (item.equalsIgnoreCase("times"))
catch (NumberFormatException ex)
{
sign.setLine(index, (quantity - 1) + " times");
return new Charge(signName.toLowerCase() + "sign", ess);
}
else
{
final ItemStack stack = getItemStack(item);
stack.setAmount(quantity);
return new Charge(quantity, ess);
throw new SignException(Util.i18n("invalidCharge"), ex);
}
}
}