summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWesley Wolfe <weswolf@aol.com>2013-09-04 17:01:02 -0500
committerWesley Wolfe <weswolf@aol.com>2013-09-11 02:17:22 -0500
commitb4a12b30d3a76a41bc724ee64998dde92ae37b26 (patch)
tree24da7f9873e42461fe12c274e191758e3527cf5f
parente163e5504b268edda8e32a6b63e2d5d0ee988a4b (diff)
downloadbukkit-b4a12b30d3a76a41bc724ee64998dde92ae37b26.tar
bukkit-b4a12b30d3a76a41bc724ee64998dde92ae37b26.tar.gz
bukkit-b4a12b30d3a76a41bc724ee64998dde92ae37b26.tar.lz
bukkit-b4a12b30d3a76a41bc724ee64998dde92ae37b26.tar.xz
bukkit-b4a12b30d3a76a41bc724ee64998dde92ae37b26.zip
Correct some magic values. This amends 1f83111208ab3612f384a2e6b65cc28423dc625e
-rw-r--r--src/main/java/org/bukkit/potion/Potion.java2
-rw-r--r--src/main/java/org/bukkit/potion/PotionType.java5
2 files changed, 2 insertions, 5 deletions
diff --git a/src/main/java/org/bukkit/potion/Potion.java b/src/main/java/org/bukkit/potion/Potion.java
index 43e5694c..0d44ce0b 100644
--- a/src/main/java/org/bukkit/potion/Potion.java
+++ b/src/main/java/org/bukkit/potion/Potion.java
@@ -310,7 +310,9 @@ public class Potion {
* item stacks.
*
* @return The damage value of this potion
+ * @deprecated Magic value
*/
+ @Deprecated
public short toDamageValue() {
short damage;
if (type == PotionType.WATER) {
diff --git a/src/main/java/org/bukkit/potion/PotionType.java b/src/main/java/org/bukkit/potion/PotionType.java
index 5913ad76..dab02935 100644
--- a/src/main/java/org/bukkit/potion/PotionType.java
+++ b/src/main/java/org/bukkit/potion/PotionType.java
@@ -58,11 +58,6 @@ public enum PotionType {
return null;
}
- /**
- *
- * @deprecated Magic value
- */
- @Deprecated
public static PotionType getByEffect(PotionEffectType effectType) {
if (effectType == null)
return WATER;