Update S

Also drop a few patches which are no longer needed/already merged in.

Spigot-Server-Patches/Handle-plugin-prefixes-using-Log4J-configuration.patch

@@ -28,7 +28,7 @@ index a93ed45df9..bb32cb749d 100644
  
          <!-- Paper - Add additional Log4J dependencies -->
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 676780b619..5a873fe9d7 100644
+index ffbb1e894a..7f3543970f 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -0,0 +0,0 @@ public class SpigotConfig

Spigot-Server-Patches/Implement-extended-PaperServerListPingEvent.patch

@@ -177,7 +177,7 @@ index 0000000000..350410527b
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cdcc375923..66b637326a 100644
+index 8e72220f37..90b1871196 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -251,7 +251,7 @@ index d7e1ecc031..f20cddc41c 100644
              this.c = agameprofile;
          }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 5a873fe9d7..42bd3b6edd 100644
+index 7f3543970f..6cc48258dc 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -0,0 +0,0 @@ public class SpigotConfig