diff options
| author | Wesley Wolfe <weswolf@aol.com> | 2012-10-31 04:12:53 -0500 |
|---|---|---|
| committer | Wesley Wolfe <weswolf@aol.com> | 2012-10-31 04:19:11 -0500 |
| commit | a94a0b209d1a7c43400bc657b053f793d009c3f9 (patch) | |
| tree | b0ea52a7976c078383705d084abc15a1ebfdb900 | |
| parent | 6b333649492712056504439a07aa570db1ccf7f5 (diff) | |
| download | bukkit-a94a0b209d1a7c43400bc657b053f793d009c3f9.tar bukkit-a94a0b209d1a7c43400bc657b053f793d009c3f9.tar.gz bukkit-a94a0b209d1a7c43400bc657b053f793d009c3f9.tar.lz bukkit-a94a0b209d1a7c43400bc657b053f793d009c3f9.tar.xz bukkit-a94a0b209d1a7c43400bc657b053f793d009c3f9.zip | |
Provide the 1.4.2 potions. Adds BUKKIT-2727.
Two potion types were missing from the 1.4.2 update. Invisibility and
night vision are now in the potion type enum.
Fixes an erroneous use of PotionEffectType.SPEED where it should have
been WEAKNESS.
Removed deprecation for the PotionEffectType relating to certain effects
that are now active in 1.4.2.
Fixes BUKKIT-2677, BUKKIT-2758.
| -rw-r--r-- | src/main/java/org/bukkit/potion/PotionEffectType.java | 6 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/potion/PotionType.java | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java index c478844f..626987a9 100644 --- a/src/main/java/org/bukkit/potion/PotionEffectType.java +++ b/src/main/java/org/bukkit/potion/PotionEffectType.java @@ -77,8 +77,7 @@ public abstract class PotionEffectType { /** * Grants invisibility. */ - @Deprecated - public static final PotionEffectType INVISIBILITY = new PotionEffectTypeWrapper(14); // unimplemented + public static final PotionEffectType INVISIBILITY = new PotionEffectTypeWrapper(14); /** * Blinds an entity. @@ -88,8 +87,7 @@ public abstract class PotionEffectType { /** * Allows an entity to see in the dark. */ - @Deprecated - public static final PotionEffectType NIGHT_VISION = new PotionEffectTypeWrapper(16); // unimplemented + public static final PotionEffectType NIGHT_VISION = new PotionEffectTypeWrapper(16); /** * Increases hunger. diff --git a/src/main/java/org/bukkit/potion/PotionType.java b/src/main/java/org/bukkit/potion/PotionType.java index eb0f9f8b..f9a19cf8 100644 --- a/src/main/java/org/bukkit/potion/PotionType.java +++ b/src/main/java/org/bukkit/potion/PotionType.java @@ -7,10 +7,13 @@ public enum PotionType { FIRE_RESISTANCE(3, PotionEffectType.FIRE_RESISTANCE, 1), POISON(4, PotionEffectType.POISON, 2), INSTANT_HEAL(5, PotionEffectType.HEAL, 2), - WEAKNESS(8, PotionEffectType.SPEED, 1), + NIGHT_VISION(6, PotionEffectType.NIGHT_VISION, 1), + WEAKNESS(8, PotionEffectType.WEAKNESS, 1), STRENGTH(9, PotionEffectType.INCREASE_DAMAGE, 2), SLOWNESS(10, PotionEffectType.SLOW, 1), - INSTANT_DAMAGE(12, PotionEffectType.HARM, 2); + INSTANT_DAMAGE(12, PotionEffectType.HARM, 2), + INVISIBILTY(14, PotionEffectType.INVISIBILITY, 1), + ; private final int damageValue, maxLevel; private final PotionEffectType effect; |