Squash patches

patches/server/0022-Revert-purpur-spark-profiler.patch

@@ -1,50 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
-Date: Mon, 24 Oct 2022 01:10:37 -0400
-Subject: [PATCH] Revert purpur spark profiler
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a57d633c439f66cb27209f56abf391e84bbb52c5..ef0f8c37308dc2fa97bff437319a850526e660c2 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -436,38 +436,7 @@ public final class CraftServer implements Server {
-             if (!pluginFolder.exists()) {
-                 pluginFolder.mkdirs();
-             }
--            // Purpur start
--            List<File> extraJars = this.extraPluginJars();
--            if (!Boolean.getBoolean("Purpur.IReallyDontWantSpark")) {
--                try {
--                    File file = new File("cache", "spark.jar");
--                    file.getParentFile().mkdirs();
--
--                    boolean shouldDownload = true;
--                    if (file.exists()) {
--                        String fileSha1 = String.format("%040x", new java.math.BigInteger(1, java.security.MessageDigest.getInstance("SHA-1").digest(java.nio.file.Files.readAllBytes(file.toPath()))));
--                        String sparkSha1;
--                        try (java.io.BufferedReader reader = new java.io.BufferedReader(new InputStreamReader(new java.net.URL("https://sparkapi.lucko.me/download/bukkit/sha1").openStream()))) {
--                            sparkSha1 = reader.lines().collect(Collectors.joining(""));
--                        }
--
--                        if (fileSha1.equals(sparkSha1)) {
--                            shouldDownload = false;
--                        }
--                    }
--
--                    if (shouldDownload) {
--                        java.nio.file.Files.copy(new java.net.URL("https://sparkapi.lucko.me/download/bukkit").openStream(), file.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING);
--                    }
--
--                    extraJars.add(file);
--                } catch (Exception e) {
--                    getLogger().severe("Purpur: Failed to download and install spark plugin");
--                    e.printStackTrace();
--                }
--            }
--            Plugin[] plugins = this.pluginManager.loadPlugins(pluginFolder, extraJars);
--            // Purpur end
-+            Plugin[] plugins = this.pluginManager.loadPlugins(pluginFolder, this.extraPluginJars());
-             // Paper end
-             for (Plugin plugin : plugins) {
-                 try {

patches/server/0022-Use-Timings-v2-instead-of-spark.patch

@@ -1,9 +1,9 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: nostalgic853 <yuu8583@proton.me>
 Date: Tue, 25 Oct 2022 01:29:25 +0800
-Subject: [PATCH] Revert purpur "Remove Timings"
+Subject: [PATCH] Use Timings v2 instead of spark
 
-This reverts commit 0fb6171d
+Let users choose it.
 
 diff --git a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java
 index 830d863cd9665d58875bfa5ca2bcd22f89ab2d49..e5d9c6f2cbe11c2ded6d8ad111fa6a8b2086dfba 100644
@@ -1416,6 +1416,50 @@ index 7249fe1d53c22d4164c68cb89b8df95e92873d1b..e0e4a924e926b086699998095a1abddd
                          // Spigot end
                      }
                  }
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+index a57d633c439f66cb27209f56abf391e84bbb52c5..ef0f8c37308dc2fa97bff437319a850526e660c2 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -436,38 +436,7 @@ public final class CraftServer implements Server {
+             if (!pluginFolder.exists()) {
+                 pluginFolder.mkdirs();
+             }
+-            // Purpur start
+-            List<File> extraJars = this.extraPluginJars();
+-            if (!Boolean.getBoolean("Purpur.IReallyDontWantSpark")) {
+-                try {
+-                    File file = new File("cache", "spark.jar");
+-                    file.getParentFile().mkdirs();
+-
+-                    boolean shouldDownload = true;
+-                    if (file.exists()) {
+-                        String fileSha1 = String.format("%040x", new java.math.BigInteger(1, java.security.MessageDigest.getInstance("SHA-1").digest(java.nio.file.Files.readAllBytes(file.toPath()))));
+-                        String sparkSha1;
+-                        try (java.io.BufferedReader reader = new java.io.BufferedReader(new InputStreamReader(new java.net.URL("https://sparkapi.lucko.me/download/bukkit/sha1").openStream()))) {
+-                            sparkSha1 = reader.lines().collect(Collectors.joining(""));
+-                        }
+-
+-                        if (fileSha1.equals(sparkSha1)) {
+-                            shouldDownload = false;
+-                        }
+-                    }
+-
+-                    if (shouldDownload) {
+-                        java.nio.file.Files.copy(new java.net.URL("https://sparkapi.lucko.me/download/bukkit").openStream(), file.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+-                    }
+-
+-                    extraJars.add(file);
+-                } catch (Exception e) {
+-                    getLogger().severe("Purpur: Failed to download and install spark plugin");
+-                    e.printStackTrace();
+-                }
+-            }
+-            Plugin[] plugins = this.pluginManager.loadPlugins(pluginFolder, extraJars);
+-            // Purpur end
++            Plugin[] plugins = this.pluginManager.loadPlugins(pluginFolder, this.extraPluginJars());
+             // Paper end
+             for (Plugin plugin : plugins) {
+                 try {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 index 5402098dce0d64d3dceea51f248d7d366850a74f..d1526ed7197b883e1d1f07baf285bf5eef4d20d5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java