summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthew <stteg@hotmail.com>2016-03-13 17:39:44 -0400
committermd_5 <git@md-5.net>2016-03-14 16:54:57 +1100
commite43b2780a5d627a844ee19e8adc937bf6ddd40d0 (patch)
tree7113f7c372cea3f94ed65cc4811ba8a2dd577d68 /src
parent87e677ce49bb27be69206d54566bf7d621108925 (diff)
downloadcraftbukkit-e43b2780a5d627a844ee19e8adc937bf6ddd40d0.tar
craftbukkit-e43b2780a5d627a844ee19e8adc937bf6ddd40d0.tar.gz
craftbukkit-e43b2780a5d627a844ee19e8adc937bf6ddd40d0.tar.lz
craftbukkit-e43b2780a5d627a844ee19e8adc937bf6ddd40d0.tar.xz
craftbukkit-e43b2780a5d627a844ee19e8adc937bf6ddd40d0.zip
SPIGOT-1914: Compare PotionEffectType objects using Object#equals(Object) when searching for a custom effect to remove
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java
index 50612a91..569a92d3 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java
@@ -205,7 +205,7 @@ class CraftMetaPotion extends CraftMetaItem implements PotionMeta {
Iterator<PotionEffect> iterator = customEffects.iterator();
while (iterator.hasNext()) {
PotionEffect effect = iterator.next();
- if (effect.getType() == type) {
+ if (type.equals(effect.getType())) {
iterator.remove();
changed = true;
}