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/0666-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0666-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
new file mode 100644
index 0000000000..d797848359
--- /dev/null
+++ b/patches/server/0666-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jason Penilla <[email protected]>
+Date: Sat, 12 Feb 2022 12:40:50 -0700
+Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
+
+Copies appropriate checks from CraftWorld#getSpawnLimit
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+index 551ae9e529727d84722a0b27d3e3dcc121f51767..1ffef484192ea535482d42909bdb169892058441 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -2328,6 +2328,8 @@ public final class CraftServer implements Server {
+     @Override
+     public int getSpawnLimit(SpawnCategory spawnCategory) {
+         // Paper start - Add mobcaps commands
++        Preconditions.checkArgument(spawnCategory != null, "SpawnCategory cannot be null");
++        Preconditions.checkArgument(CraftSpawnCategory.isValidForLimits(spawnCategory), "SpawnCategory." + spawnCategory + " does not have a spawn limit.");
+         return this.getSpawnLimitUnsafe(spawnCategory);
+     }
+     public int getSpawnLimitUnsafe(final SpawnCategory spawnCategory) {