Move diffs around to compile without later ones applied

1 files changed, 24 insertions, 0 deletions

diff --git a/patches/server/0884-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0884-Add-method-to-remove-all-active-potion-effects.patch
new file mode 100644
index 0000000000..56ade4ed63
--- /dev/null
+++ b/patches/server/0884-Add-method-to-remove-all-active-potion-effects.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sat, 17 Jun 2023 13:17:25 -0700
+Subject: [PATCH] Add method to remove all active potion effects
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+index 310ce32708601d95cda2647e101d02d48ccdbb77..4afc1c9d2a7638e84a55fe30932dc36db465c31a 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+@@ -502,6 +502,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+         return effects;
+     }
+ 
++    // Paper start - LivingEntity#clearActivePotionEffects();
++    @Override
++    public boolean clearActivePotionEffects() {
++        return this.getHandle().removeAllEffects(EntityPotionEffectEvent.Cause.PLUGIN);
++    }
++    // Paper end
++
+     @Override
+     public <T extends Projectile> T launchProjectile(Class<? extends T> projectile) {
+         return this.launchProjectile(projectile, null);