From d5ef2eab9ea18a1433580316dc494c33ab45fa9e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 23 Feb 2020 10:33:10 +1100
Subject: [PATCH] SPIGOT-5591: Allow concurrent potion effects
---
.../org/bukkit/craftbukkit/entity/CraftLivingEntity.java | 6 ------
1 file changed, 6 deletions(-)
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 9c1d4e7585..959e7e6d9d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -321,12 +321,6 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@Override
public boolean addPotionEffect(PotionEffect effect, boolean force) {
- if (hasPotionEffect(effect.getType())) {
- if (!force) {
- return false;
- }
- removePotionEffect(effect.getType());
- }
getHandle().addEffect(new MobEffect(MobEffectList.fromId(effect.getType().getId()), effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles()), EntityPotionEffectEvent.Cause.PLUGIN);
return true;
}