From d623ad5b5ae52bcaa087ab1dda0be5f7c2eb4063 Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Fri, 16 Dec 2016 17:21:43 +0100 Subject: [PATCH] SPIGOT-2923: Added PotionEffectType#getColor() By: Lukas Hennig --- .../src/main/java/org/bukkit/potion/PotionEffectType.java | 8 ++++++++ .../java/org/bukkit/potion/PotionEffectTypeWrapper.java | 7 +++++++ 2 files changed, 15 insertions(+) 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 27c1f47c91..b7c068b5fc 100644 --- a/paper-api/src/main/java/org/bukkit/potion/PotionEffectType.java +++ b/paper-api/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/paper-api/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java b/paper-api/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java index 5db1ce85e8..356a866fec 100644 --- a/paper-api/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java +++ b/paper-api/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(); + } }