TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-05-08 16:46:57 +00:00
Code Issues Projects Releases Wiki Activity

Don't check people for meta perms when using kits.

Browse source
This commit is contained in:
KHobbits 2013-03-07 02:57:25 +00:00
parent 32d44eb13d
commit 7d0fafd084
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/Kit.java
View file

@ -120,7 +120,7 @@ public class Kit
if (parts.length > 2) if (parts.length > 2)
{ {
metaStack.parseStringMeta(user, allowUnsafe, parts, 2, ess); metaStack.parseStringMeta(null, allowUnsafe, parts, 2, ess);
} }
final Map<Integer, ItemStack> overfilled; final Map<Integer, ItemStack> overfilled;

6
Essentials/src/com/earth2me/essentials/MetaItemStack.java
View file

@ -169,7 +169,7 @@ public class MetaItemStack
} }
else else
{ {
sender.sendMessage(_("noChapterMeta")); throw new Exception(_("noChapterMeta"));
} }
} }
@ -270,7 +270,6 @@ public class MetaItemStack
} }
else else
{ {
sender.sendMessage(_("fireworkSyntax"));
throw new Exception(_("invalidFireworkFormat", split[1], split[0])); throw new Exception(_("invalidFireworkFormat", split[1], split[0]));
} }
} }
@ -286,7 +285,6 @@ public class MetaItemStack
} }
else else
{ {
sender.sendMessage(_("fireworkSyntax"));
throw new Exception(_("invalidFireworkFormat", split[1], split[0])); throw new Exception(_("invalidFireworkFormat", split[1], split[0]));
} }
if (finalEffect != null) if (finalEffect != null)
@ -306,7 +304,6 @@ public class MetaItemStack
} }
else else
{ {
sender.sendMessage(_("fireworkSyntax"));
throw new Exception(_("invalidFireworkFormat", split[1], split[0])); throw new Exception(_("invalidFireworkFormat", split[1], split[0]));
} }
} }
@ -330,7 +327,6 @@ public class MetaItemStack
} }
else else
{ {
sender.sendMessage(_("fireworkSyntax"));
throw new Exception(_("invalidFireworkFormat", split[1], split[0])); throw new Exception(_("invalidFireworkFormat", split[1], split[0]));
} }
} }

10
Essentials/src/com/earth2me/essentials/commands/Commandfirework.java
View file

@ -111,7 +111,15 @@ public class Commandfirework extends EssentialsCommand
final MetaItemStack mStack = new MetaItemStack(stack); final MetaItemStack mStack = new MetaItemStack(stack);
for (String arg : args) for (String arg : args)
{ {
mStack.addFireworkMeta(user, true, arg, ess); try
{
mStack.addFireworkMeta(user, true, arg, ess);
}
catch (Exception e)
{
user.sendMessage(_("fireworkSyntax"));
throw e;
}
} }
if (mStack.isValidFirework()) if (mStack.isValidFirework())