TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-07-03 04:21:37 +00:00
Code Issues Projects Releases Wiki Activity

Fix potion effect errors

Browse source
This commit is contained in:
KHobbits 2013-03-16 09:13:21 +00:00
parent 6185581962
commit 1111254e46
15 changed files with 31 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -349,21 +349,18 @@ public class MetaItemStack
pEffectType = Potions.getByName(split[1]);
if (pEffectType != null && pEffectType.getName() != null)
{
if (hasMetaPermission(sender, "potions." + pEffectType.getName().toLowerCase(Locale.ENGLISH), false, false, ess))
if (hasMetaPermission(sender, "potions." + pEffectType.getName().toLowerCase(Locale.ENGLISH), true, false, ess))
{
validPotionEffect = true;
canceledEffect = false;
}
else
{
canceledEffect = true;
sender.sendMessage(_("invalidPotionEffect", pEffectType.getName().toLowerCase(Locale.ENGLISH)));
throw new Exception(_("noPotionEffectPerm", pEffectType.getName().toLowerCase(Locale.ENGLISH)));
}
}
else
{
sender.sendMessage(_("invalidPotionEffect", split[1]));
canceledEffect = true;
throw new Exception(_("invalidPotionEffect", split[1]));
}
}
else if (split[0].equalsIgnoreCase("power") || (allowShortName && split[0].equalsIgnoreCase("p")))
@ -383,7 +380,7 @@ public class MetaItemStack
}
}
if (isValidPotion() && !canceledEffect)
if (isValidPotion())
{
PotionMeta pmeta = (PotionMeta)stack.getItemMeta();
pEffect = pEffectType.createEffect(duration, power);