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

Fix yaml issue with /kit

Browse Source
This commit is contained in:
KHobbits 2012-08-10 02:26:23 +01:00
parent e198b61eae
commit 8aab57e86b
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,6 +78,7 @@ public class Kit
{ {
throw new Exception(_("kitError2")); throw new Exception(_("kitError2"));
} }
try try
{ {

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

@ -26,12 +26,12 @@ public class Commandkit extends EssentialsCommand
else if (args.length > 1 && user.isAuthorized("essentials.kit.others")) else if (args.length > 1 && user.isAuthorized("essentials.kit.others"))
{ {
final User userTo = getPlayer(server, args, 1, true); final User userTo = getPlayer(server, args, 1, true);
final String kitName = Util.sanitizeString(args[0].toLowerCase(Locale.ENGLISH)); final String kitName = Util.sanitizeString(args[0].toLowerCase(Locale.ENGLISH)).trim();
giveKit(userTo, user, kitName); giveKit(userTo, user, kitName);
} }
else else
{ {
final String kitName = Util.sanitizeString(args[0].toLowerCase(Locale.ENGLISH)); final String kitName = Util.sanitizeString(args[0].toLowerCase(Locale.ENGLISH)).trim();
giveKit(user, user, kitName); giveKit(user, user, kitName);
} }
} }
@ -59,7 +59,12 @@ public class Commandkit extends EssentialsCommand
} }
private void giveKit(User userTo, User userFrom, String kitName) throws Exception private void giveKit(User userTo, User userFrom, String kitName) throws Exception
{ {
if (kitName.isEmpty())
{
throw new Exception(_("kitError2"));
}
final Map<String, Object> kit = ess.getSettings().getKit(kitName); final Map<String, Object> kit = ess.getSettings().getKit(kitName);
if (!userFrom.isAuthorized("essentials.kit." + kitName)) if (!userFrom.isAuthorized("essentials.kit." + kitName))

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

@ -19,7 +19,7 @@ public class SignKit extends EssentialsSign
{ {
validateTrade(sign, 3, ess); validateTrade(sign, 3, ess);
final String kitName = sign.getLine(1).toLowerCase(Locale.ENGLISH); final String kitName = sign.getLine(1).toLowerCase(Locale.ENGLISH).trim();
if (kitName.isEmpty()) if (kitName.isEmpty())
{ {
@ -48,7 +48,7 @@ public class SignKit extends EssentialsSign
@Override @Override
protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException
{ {
final String kitName = sign.getLine(1).toLowerCase(Locale.ENGLISH); final String kitName = sign.getLine(1).toLowerCase(Locale.ENGLISH).trim();
final String group = sign.getLine(2); final String group = sign.getLine(2);
if ((!group.isEmpty() && ("§2Everyone".equals(group) || player.inGroup(group))) if ((!group.isEmpty() && ("§2Everyone".equals(group) || player.inGroup(group)))
|| (group.isEmpty() && (player.isAuthorized("essentials.kit." + kitName)))) || (group.isEmpty() && (player.isAuthorized("essentials.kit." + kitName))))