diff options
author | Lukas Hennig <lukas@wirsindwir.de> | 2016-12-16 17:21:43 +0100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-12-17 09:48:08 +1100 |
commit | 55fa63e8b9c8f5f315f3d631fad2096a008074df (patch) | |
tree | 0b8397a28a2ec265873ac94da3b7bc1ee5dfe146 | |
parent | 703a1cf8353492f83c8b2c1bfd61bc618254c085 (diff) | |
download | bukkit-55fa63e8b9c8f5f315f3d631fad2096a008074df.tar bukkit-55fa63e8b9c8f5f315f3d631fad2096a008074df.tar.gz bukkit-55fa63e8b9c8f5f315f3d631fad2096a008074df.tar.lz bukkit-55fa63e8b9c8f5f315f3d631fad2096a008074df.tar.xz bukkit-55fa63e8b9c8f5f315f3d631fad2096a008074df.zip |
SPIGOT-2923: Added PotionEffectType#getColor()
-rw-r--r-- | src/main/java/org/bukkit/potion/PotionEffectType.java | 8 | ||||
-rw-r--r-- | src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java | 7 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java index 27c1f47c..b7c068b5 100644 --- a/src/main/java/org/bukkit/potion/PotionEffectType.java +++ b/src/main/java/org/bukkit/potion/PotionEffectType.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.commons.lang.Validate; +import org.bukkit.Color; /** * Represents a type of potion and its effect on an entity. @@ -197,6 +198,13 @@ public abstract class PotionEffectType { */ public abstract boolean isInstant(); + /** + * Returns the color of this effect type. + * + * @return the color + */ + public abstract Color getColor(); + @Override public boolean equals(Object obj) { if (obj == null) { diff --git a/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java b/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java index 5db1ce85..356a866f 100644 --- a/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java +++ b/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java @@ -1,5 +1,7 @@ package org.bukkit.potion; +import org.bukkit.Color; + public class PotionEffectTypeWrapper extends PotionEffectType { protected PotionEffectTypeWrapper(int id) { super(id); @@ -28,4 +30,9 @@ public class PotionEffectTypeWrapper extends PotionEffectType { public boolean isInstant() { return getType().isInstant(); } + + @Override + public Color getColor() { + return getType().getColor(); + } } |