Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid Bukkit error with water potions.

Browse Source
This commit is contained in:
Olof Larsson 2013-08-07 08:03:08 +02:00
parent 0d5fb204a6
commit d4317583b6
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/massivecraft/mcore/util/MUtil.java
View File

@ -314,15 +314,28 @@ public class MUtil
public static int getPotionEffectBits(ItemStack item) public static int getPotionEffectBits(ItemStack item)
{ {
return item.getDurability() & 0x3F; return item.getDurability() & 0x3F;
} }
/**
* Checks if the given potion is a vial of water.
*
* @param item the item to check
* @return true if it's a water vial
*/
public static boolean isWaterPotion(ItemStack item)
{
return getPotionEffectBits(item) == 0;
}
public static List<PotionEffect> getPotionEffects(ItemStack itemStack) public static List<PotionEffect> getPotionEffects(ItemStack itemStack)
{ {
if (itemStack == null) return null; if (itemStack == null) return null;
if (itemStack.getType() != Material.POTION) return null; if (itemStack.getType() != Material.POTION) return null;
List<PotionEffect> ret = new ArrayList<PotionEffect>(); List<PotionEffect> ret = new ArrayList<PotionEffect>();
if (isWaterPotion(itemStack)) return ret;
Potion potion = Potion.fromDamage(getPotionEffectBits(itemStack)); Potion potion = Potion.fromDamage(getPotionEffectBits(itemStack));
ret.addAll(potion.getEffects()); ret.addAll(potion.getEffects());