Remove bad server.scheduleOnMain disconnect calls from old patches

The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point

1 files changed, 24 insertions, 0 deletions

diff --git a/patches/server/0832-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0832-Add-method-to-remove-all-active-potion-effects.patch
new file mode 100644
index 0000000000..0acdf4ee22
--- /dev/null
+++ b/patches/server/0832-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 292e1701694b0cb0cb9103244e6e59e07b5838b2..a1e715629313346f670bce92483996122b0f1d7b 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+@@ -563,6 +563,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);