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, 41 insertions, 0 deletions

diff --git a/patches/server/0825-Add-transient-modifier-API.patch b/patches/server/0825-Add-transient-modifier-API.patch
new file mode 100644
index 0000000000..36cc0a030a
--- /dev/null
+++ b/patches/server/0825-Add-transient-modifier-API.patch
@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Malfrador <[email protected]>
+Date: Wed, 31 May 2023 23:30:00 +0200
+Subject: [PATCH] Add transient modifier API
+
+
+diff --git a/src/main/java/io/papermc/paper/attribute/UnmodifiableAttributeInstance.java b/src/main/java/io/papermc/paper/attribute/UnmodifiableAttributeInstance.java
+index 12135ffeacd648f6bc4d7d327059ea1a7e8c79c4..52439f4b959c74027eb191a3af960c70beb978e8 100644
+--- a/src/main/java/io/papermc/paper/attribute/UnmodifiableAttributeInstance.java
++++ b/src/main/java/io/papermc/paper/attribute/UnmodifiableAttributeInstance.java
+@@ -23,6 +23,11 @@ public class UnmodifiableAttributeInstance extends CraftAttributeInstance {
+         throw new UnsupportedOperationException("Cannot modify default attributes");
+     }
+ 
++    @Override
++    public void addTransientModifier(AttributeModifier modifier) {
++        throw new UnsupportedOperationException("Cannot modify default attributes");
++    }
++
+     @Override
+     public void removeModifier(AttributeModifier modifier) {
+         throw new UnsupportedOperationException("Cannot modify default attributes");
+diff --git a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
+index 3b171a08bd0bedfe224905feb5838d2540199bce..cd6a492f56b3dee5985c068e20009b6c833e143b 100644
+--- a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
++++ b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
+@@ -51,6 +51,14 @@ public class CraftAttributeInstance implements AttributeInstance {
+         this.handle.addPermanentModifier(CraftAttributeInstance.convert(modifier));
+     }
+ 
++    // Paper start - Transient modifier API
++    @Override
++    public void addTransientModifier(AttributeModifier modifier) {
++        Preconditions.checkArgument(modifier != null, "modifier");
++        this.handle.addTransientModifier(CraftAttributeInstance.convert(modifier));
++    }
++    // Paper end
++
+     @Override
+     public void removeModifier(AttributeModifier modifier) {
+         Preconditions.checkArgument(modifier != null, "modifier");