mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
c795c61137
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@afe633d convert API/server tests to mockito (#8848) PaperMC/Paper@03a4e7a Updated Upstream (Bukkit/CraftBukkit) (#8832) PaperMC/Paper@5c87711 Make sure Registry is loaded after Bukkit.setServer() (#8853)
57 lines
3.0 KiB
Diff
57 lines
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Ben Kerllenevich <ben@omega24.dev>
|
|
Date: Sat, 25 Jun 2022 19:40:36 -0400
|
|
Subject: [PATCH] Spark Profiler
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index cd1906a3dcb52de5deed02e1b0005fe83c91f211..97f357a6c8d600daf68b249e04da1f7008b14302 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -434,7 +434,44 @@ public final class CraftServer implements Server {
|
|
if (!pluginFolder.exists()) {
|
|
pluginFolder.mkdirs();
|
|
}
|
|
- Plugin[] plugins = this.pluginManager.loadPlugins(pluginFolder, this.extraPluginJars());
|
|
+ // 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;
|
|
+ java.net.URLConnection urlConnection = new java.net.URL("https://sparkapi.lucko.me/download/bukkit/sha1").openConnection();
|
|
+ urlConnection.setReadTimeout(5000);
|
|
+ urlConnection.setConnectTimeout(5000);
|
|
+ try (java.io.BufferedReader reader = new java.io.BufferedReader(new InputStreamReader(urlConnection.getInputStream()))) {
|
|
+ sparkSha1 = reader.lines().collect(Collectors.joining(""));
|
|
+ }
|
|
+
|
|
+ if (fileSha1.equals(sparkSha1)) {
|
|
+ shouldDownload = false;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (shouldDownload) {
|
|
+ java.net.URLConnection urlConnection = new java.net.URL("https://sparkapi.lucko.me/download/bukkit").openConnection();
|
|
+ urlConnection.setReadTimeout(5000);
|
|
+ urlConnection.setConnectTimeout(5000);
|
|
+ java.nio.file.Files.copy(urlConnection.getInputStream(), 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
|
|
// Paper end
|
|
for (Plugin plugin : plugins) {
|
|
try {
|