mirror of
https://github.com/EssentialsX/Essentials.git
synced 2024-09-19 11:31:03 +02:00
Merge pull request #396 from GunfighterJ/2.9
Allow potion clear/apply commands to work
This commit is contained in:
commit
fe28faf79d
@ -42,11 +42,6 @@ public class Commandpotion extends EssentialsCommand
|
|||||||
}
|
}
|
||||||
throw new NotEnoughArgumentsException(_("potions", Util.joinList(potionslist.toArray())));
|
throw new NotEnoughArgumentsException(_("potions", Util.joinList(potionslist.toArray())));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (args.length < 3)
|
|
||||||
{
|
|
||||||
throw new NotEnoughArgumentsException();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (stack.getType() == Material.POTION)
|
if (stack.getType() == Material.POTION)
|
||||||
{
|
{
|
||||||
@ -60,11 +55,15 @@ public class Commandpotion extends EssentialsCommand
|
|||||||
}
|
}
|
||||||
else if (args[0].equalsIgnoreCase("apply") && user.isAuthorized("essentials.potion.apply"))
|
else if (args[0].equalsIgnoreCase("apply") && user.isAuthorized("essentials.potion.apply"))
|
||||||
{
|
{
|
||||||
for(PotionEffect effect : pmeta.getCustomEffects())
|
for (PotionEffect effect : pmeta.getCustomEffects())
|
||||||
{
|
{
|
||||||
effect.apply(user);
|
effect.apply(user);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (args.length < 3)
|
||||||
|
{
|
||||||
|
throw new NotEnoughArgumentsException();
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
final MetaItemStack mStack = new MetaItemStack(stack);
|
final MetaItemStack mStack = new MetaItemStack(stack);
|
||||||
|
Loading…
Reference in New Issue
Block a user