From 80c98cb5d4761953844dc42e4dd0ae992007a6ae Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Wed, 31 Oct 2012 04:12:53 -0500 Subject: [PATCH] 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. By: Wesley Wolfe --- .../src/main/java/org/bukkit/potion/PotionEffectType.java | 6 ++---- paper-api/src/main/java/org/bukkit/potion/PotionType.java | 7 +++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/potion/PotionEffectType.java b/paper-api/src/main/java/org/bukkit/potion/PotionEffectType.java index c478844f75..626987a987 100644 --- a/paper-api/src/main/java/org/bukkit/potion/PotionEffectType.java +++ b/paper-api/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/paper-api/src/main/java/org/bukkit/potion/PotionType.java b/paper-api/src/main/java/org/bukkit/potion/PotionType.java index eb0f9f8bdd..f9a19cf80c 100644 --- a/paper-api/src/main/java/org/bukkit/potion/PotionType.java +++ b/paper-api/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;