diff options
| author | FearThe1337 <admin@fearthe1337.com> | 2014-12-17 17:22:02 +0100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2014-12-18 09:46:45 +1100 |
| commit | 59ca64d6aecc5a33425add23616ab33f334234c8 (patch) | |
| tree | 07a283279d122ebf22b583e3d5d889b41bf08999 /src/main | |
| parent | 7714b7034f4f99387db967f2e6e28ec02a3f1cc5 (diff) | |
| download | bukkit-59ca64d6aecc5a33425add23616ab33f334234c8.tar bukkit-59ca64d6aecc5a33425add23616ab33f334234c8.tar.gz bukkit-59ca64d6aecc5a33425add23616ab33f334234c8.tar.lz bukkit-59ca64d6aecc5a33425add23616ab33f334234c8.tar.xz bukkit-59ca64d6aecc5a33425add23616ab33f334234c8.zip | |
Fix the decoding of potions for Water.
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/org/bukkit/potion/Potion.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/potion/Potion.java b/src/main/java/org/bukkit/potion/Potion.java index 8966c906..edc91754 100644 --- a/src/main/java/org/bukkit/potion/Potion.java +++ b/src/main/java/org/bukkit/potion/Potion.java @@ -395,7 +395,7 @@ public class Potion { public static Potion fromDamage(int damage) { PotionType type = PotionType.getByDamageValue(damage & POTION_BIT); Potion potion; - if (type == null || (type == PotionType.WATER && damage != 0)) { + if (type == null || type == PotionType.WATER) { potion = new Potion(damage & NAME_BIT); } else { int level = (damage & TIER_BIT) >> TIER_SHIFT; |