Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-10-01 17:17:27 +02: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
Show Stats 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())

5
Essentials/src/com/earth2me/essentials/commands/Commandpotion.java
View File

@ -42,6 +42,11 @@ public class Commandpotion extends EssentialsCommand
}
throw new NotEnoughArgumentsException(_("potions", Util.joinList(potionslist.toArray())));
}
if (args.length < 3)
{
throw new NotEnoughArgumentsException();
}
if (stack.getType() == Material.POTION)
{

2
Essentials/src/messages.properties
View File

@ -520,4 +520,4 @@ playerUnbanned=\u00a76Player\u00a7c {0} \u00a76unbanned {1}.
playerUnbanIpAddress=\u00a76Player\u00a7c {0} \u00a76unbanned IP: {1}.
playerBanIpAddress=\u00a76Player\u00a7c {0} \u00a76banned IP address {1}\u00a76.
noPotionEffectPerm=\u00a74You do not have permission to apply potion effect \u00a7c{0} \u00a74to this potion.
invalidPotionEffect=\u00a74Invalid potion effect: \u00a7c{0}\u00a74.
invalidPotionMeta=\u00a74Invalid potion meta: \u00a7c{0}\u00a74.

2
Essentials/src/messages_cs.properties
View File

@ -523,4 +523,4 @@ playerUnbanned=\u00a76Player\u00a7c {0} \u00a76unbanned {1}.
playerUnbanIpAddress=\u00a76Player\u00a7c {0} \u00a76unbanned IP: {1}.
playerBanIpAddress=\u00a76Player\u00a7c {0} \u00a76banned IP address {1}\u00a76.
noPotionEffectPerm=\u00a74You do not have permission to apply potion effect \u00a7c{0} \u00a74to this potion.
invalidPotionEffect=\u00a74Invalid potion effect: \u00a7c{0}\u00a74.
invalidPotionMeta=\u00a74Invalid potion meta: \u00a7c{0}\u00a74.

2
Essentials/src/messages_da.properties
View File

@ -520,4 +520,4 @@ playerUnbanned=\u00a76Player\u00a7c {0} \u00a76unbanned {1}.
playerUnbanIpAddress=\u00a76Player\u00a7c {0} \u00a76unbanned IP: {1}.
playerBanIpAddress=\u00a76Player\u00a7c {0} \u00a76banned IP address {1}\u00a76.
noPotionEffectPerm=\u00a74You do not have permission to apply potion effect \u00a7c{0} \u00a74to this potion.
invalidPotionEffect=\u00a74Invalid potion effect: \u00a7c{0}\u00a74.
invalidPotionMeta=\u00a74Invalid potion meta: \u00a7c{0}\u00a74.

2
Essentials/src/messages_de.properties
View File

@ -520,4 +520,4 @@ playerUnbanned=\u00a76Player\u00a7c {0} \u00a76unbanned {1}.
playerUnbanIpAddress=\u00a76Player\u00a7c {0} \u00a76unbanned IP: {1}.
playerBanIpAddress=\u00a76Player\u00a7c {0} \u00a76banned IP address {1}\u00a76.
noPotionEffectPerm=\u00a74You do not have permission to apply potion effect \u00a7c{0} \u00a74to this potion.
invalidPotionEffect=\u00a74Invalid potion effect: \u00a7c{0}\u00a74.
invalidPotionMeta=\u00a74Invalid potion meta: \u00a7c{0}\u00a74.

2
Essentials/src/messages_en.properties
View File

@ -520,4 +520,4 @@ playerUnbanned=\u00a76Player\u00a7c {0} \u00a76unbanned {1}.
playerUnbanIpAddress=\u00a76Player\u00a7c {0} \u00a76unbanned IP: {1}.
playerBanIpAddress=\u00a76Player\u00a7c {0} \u00a76banned IP address {1}\u00a76.
noPotionEffectPerm=\u00a74You do not have permission to apply potion effect \u00a7c{0} \u00a74to this potion.
invalidPotionEffect=\u00a74Invalid potion effect: \u00a7c{0}\u00a74.
invalidPotionMeta=\u00a74Invalid potion meta: \u00a7c{0}\u00a74.

2
Essentials/src/messages_es.properties
View File

@ -520,4 +520,4 @@ playerUnbanned=\u00a76Player\u00a7c {0} \u00a76unbanned {1}.
playerUnbanIpAddress=\u00a76Player\u00a7c {0} \u00a76unbanned IP: {1}.
playerBanIpAddress=\u00a76Player\u00a7c {0} \u00a76banned IP address {1}\u00a76.
noPotionEffectPerm=\u00a74You do not have permission to apply potion effect \u00a7c{0} \u00a74to this potion.
invalidPotionEffect=\u00a74Invalid potion effect: \u00a7c{0}\u00a74.
invalidPotionMeta=\u00a74Invalid potion meta: \u00a7c{0}\u00a74.

2
Essentials/src/messages_fi.properties
View File

@ -520,4 +520,4 @@ playerUnbanned=\u00a76Player\u00a7c {0} \u00a76unbanned {1}.
playerUnbanIpAddress=\u00a76Player\u00a7c {0} \u00a76unbanned IP: {1}.
playerBanIpAddress=\u00a76Player\u00a7c {0} \u00a76banned IP address {1}\u00a76.
noPotionEffectPerm=\u00a74You do not have permission to apply potion effect \u00a7c{0} \u00a74to this potion.
invalidPotionEffect=\u00a74Invalid potion effect: \u00a7c{0}\u00a74.
invalidPotionMeta=\u00a74Invalid potion meta: \u00a7c{0}\u00a74.

2
Essentials/src/messages_fr.properties
View File

@ -520,4 +520,4 @@ playerUnbanned=\u00a76Player\u00a7c {0} \u00a76unbanned {1}.
playerUnbanIpAddress=\u00a76Player\u00a7c {0} \u00a76unbanned IP: {1}.
playerBanIpAddress=\u00a76Player\u00a7c {0} \u00a76banned IP address {1}\u00a76.
noPotionEffectPerm=\u00a74You do not have permission to apply potion effect \u00a7c{0} \u00a74to this potion.
invalidPotionEffect=\u00a74Invalid potion effect: \u00a7c{0}\u00a74.
invalidPotionMeta=\u00a74Invalid potion meta: \u00a7c{0}\u00a74.

2
Essentials/src/messages_it.properties
View File

@ -520,4 +520,4 @@ playerUnbanned=\u00a76Player\u00a7c {0} \u00a76unbanned {1}.
playerUnbanIpAddress=\u00a76Player\u00a7c {0} \u00a76unbanned IP: {1}.
playerBanIpAddress=\u00a76Player\u00a7c {0} \u00a76banned IP address {1}\u00a76.
noPotionEffectPerm=\u00a74You do not have permission to apply potion effect \u00a7c{0} \u00a74to this potion.
invalidPotionEffect=\u00a74Invalid potion effect: \u00a7c{0}\u00a74.
invalidPotionMeta=\u00a74Invalid potion meta: \u00a7c{0}\u00a74.

2
Essentials/src/messages_nl.properties
View File

@ -520,4 +520,4 @@ playerUnbanned=\u00a76Player\u00a7c {0} \u00a76unbanned {1}.
playerUnbanIpAddress=\u00a76Player\u00a7c {0} \u00a76unbanned IP: {1}.
playerBanIpAddress=\u00a76Player\u00a7c {0} \u00a76banned IP address {1}\u00a76.
noPotionEffectPerm=\u00a74You do not have permission to apply potion effect \u00a7c{0} \u00a74to this potion.
invalidPotionEffect=\u00a74Invalid potion effect: \u00a7c{0}\u00a74.
invalidPotionMeta=\u00a74Invalid potion meta: \u00a7c{0}\u00a74.

2
Essentials/src/messages_pl.properties
View File

@ -520,4 +520,4 @@ playerUnbanned=\u00a76Player\u00a7c {0} \u00a76unbanned {1}.
playerUnbanIpAddress=\u00a76Player\u00a7c {0} \u00a76unbanned IP: {1}.
playerBanIpAddress=\u00a77Gracz\u00a7c {0} \u00a77zostal zbanowany na adres IP {1}\u00a77.
noPotionEffectPerm=\u00a74You do not have permission to apply potion effect \u00a7c{0} \u00a74to this potion.
invalidPotionEffect=\u00a74Invalid potion effect: \u00a7c{0}\u00a74.
invalidPotionMeta=\u00a74Invalid potion meta: \u00a7c{0}\u00a74.

2
Essentials/src/messages_pt.properties
View File

@ -520,4 +520,4 @@ playerUnbanned=\u00a76Player\u00a7c {0} \u00a76unbanned {1}.
playerUnbanIpAddress=\u00a76Player\u00a7c {0} \u00a76unbanned IP: {1}.
playerBanIpAddress=\u00a76Player\u00a7c {0} \u00a76banned IP address {1}\u00a76.
noPotionEffectPerm=\u00a74You do not have permission to apply potion effect \u00a7c{0} \u00a74to this potion.
invalidPotionEffect=\u00a74Invalid potion effect: \u00a7c{0}\u00a74.
invalidPotionMeta=\u00a74Invalid potion meta: \u00a7c{0}\u00a74.

2
Essentials/src/messages_se.properties
View File

@ -520,4 +520,4 @@ playerUnbanned=\u00a76Player\u00a7c {0} \u00a76unbanned {1}.
playerUnbanIpAddress=\u00a76Player\u00a7c {0} \u00a76unbanned IP: {1}.
playerBanIpAddress=\u00a76Player\u00a7c {0} \u00a76banned IP address {1}\u00a76.
noPotionEffectPerm=\u00a74You do not have permission to apply potion effect \u00a7c{0} \u00a74to this potion.
invalidPotionEffect=\u00a74Invalid potion effect \u00a7c{0}\u00a74.
invalidPotionMeta=\u00a74Invalid potion meta: \u00a7c{0}\u00a74.