From c98e5fba127d947ac455186f8ae347811d9bec44 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Sun, 23 Feb 2020 10:33:10 +1100
Subject: [PATCH] SPIGOT-5591: Allow concurrent potion effects

By: md_5 <git@md-5.net>
---
 .../org/bukkit/craftbukkit/entity/CraftLivingEntity.java    | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 9c1d4e7585..959e7e6d9d 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/paper-server/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;
     }