summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-05-02 18:24:07 +1000
committermd_5 <git@md-5.net>2016-05-02 18:24:19 +1000
commitd19bb5b8c5a47a395e11d2456ec86c9ffee88964 (patch)
treeb4f8e21c3598627ebd3c85028d2a3fe19ff80b5f /src/main/java/org
parent2a1d9d6033c8d4734dc38b8f7d42e3a7101c354a (diff)
downloadbukkit-d19bb5b8c5a47a395e11d2456ec86c9ffee88964.tar
bukkit-d19bb5b8c5a47a395e11d2456ec86c9ffee88964.tar.gz
bukkit-d19bb5b8c5a47a395e11d2456ec86c9ffee88964.tar.lz
bukkit-d19bb5b8c5a47a395e11d2456ec86c9ffee88964.tar.xz
bukkit-d19bb5b8c5a47a395e11d2456ec86c9ffee88964.zip
SPIGOT-2229: Make PotionType.getDamageValue() attempt sane return.
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/bukkit/potion/PotionType.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/org/bukkit/potion/PotionType.java b/src/main/java/org/bukkit/potion/PotionType.java
index 95f238a3..60470b88 100644
--- a/src/main/java/org/bukkit/potion/PotionType.java
+++ b/src/main/java/org/bukkit/potion/PotionType.java
@@ -43,7 +43,7 @@ public enum PotionType {
public boolean isInstant() {
return effect != null && effect.isInstant();
}
-
+
/**
* Checks if the potion type has an upgraded state.
* This refers to whether or not the potion type can be Tier 2,
@@ -64,13 +64,13 @@ public enum PotionType {
public boolean isExtendable() {
return extendable;
}
-
+
/**
* @deprecated Non-functional
*/
@Deprecated
public int getDamageValue() {
- return 0;
+ return this.ordinal();
}
public int getMaxLevel() {