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

diff --git a/patches/server/0734-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0734-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
new file mode 100644
index 0000000000..1a84359dae
--- /dev/null
+++ b/patches/server/0734-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: chickeneer <[email protected]>
+Date: Mon, 1 Aug 2022 20:13:02 -0500
+Subject: [PATCH] Fix suggest command message for brigadier syntax exceptions
+
+This is a bug accidentally introduced in upstream CB
+
+diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
+index 3141e033706599aae9a89a0975afb3954424df48..ec8ea29a71e74255660e3c084c3a708cf241d0c9 100644
+--- a/src/main/java/net/minecraft/commands/Commands.java
++++ b/src/main/java/net/minecraft/commands/Commands.java
+@@ -386,7 +386,7 @@ public class Commands {
+             if (commandsyntaxexception.getInput() != null && commandsyntaxexception.getCursor() >= 0) {
+                 int i = Math.min(commandsyntaxexception.getInput().length(), commandsyntaxexception.getCursor());
+                 MutableComponent ichatmutablecomponent = Component.empty().withStyle(ChatFormatting.GRAY).withStyle((chatmodifier) -> {
+-                    return chatmodifier.withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, label)); // CraftBukkit
++                    return chatmodifier.withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/" + label)); // CraftBukkit // Paper
+                 });
+ 
+                 if (i > 10) {