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

Potion erroring and duration/power fix

Browse source
This commit is contained in:
GunfighterJ 2013-03-17 11:35:40 -05:00 • committed by KHobbits
parent 5e4659e6ae
commit ce51a07bf1
15 changed files with 31 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -362,7 +362,7 @@ public class MetaItemStack
}
else
{
throw new Exception(_("invalidPotionEffect", split[1]));
throw new Exception(_("invalidPotionMeta", split[1]));
}
}
else if (split[0].equalsIgnoreCase("power") || (allowShortName && split[0].equalsIgnoreCase("p")))
@ -371,6 +371,14 @@ public class MetaItemStack
{
validPotionPower = true;
power = Integer.parseInt(split[1]);
if (power > 0 && power < 4)
{
power -= 1;
}
}
else
{
throw new Exception(_("invalidPotionMeta", split[1]));
}
}
else if (split[0].equalsIgnoreCase("duration") || (allowShortName && split[0].equalsIgnoreCase("d")))
@ -380,6 +388,10 @@ public class MetaItemStack
validPotionDuration = true;
duration = Integer.parseInt(split[1]) * 20; //Duration is in ticks by default, converted to seconds
}
else
{
throw new Exception(_("invalidPotionMeta", split[1]));
}
}
if (isValidPotion())