Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't download spark if cached version matches

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-26 07:44:51 -04:00
parent 28c9dcb368
commit b4a75c0d79
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
patches/server/0280-Spark-Profiler.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Spark Profiler
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7960433f8278e3bd0ec43db3d3820ff2740a7c13..c6303baeefcbe85cde815fef02d1fcd78685ab7f 100644 index 7960433f8278e3bd0ec43db3d3820ff2740a7c13..3048fe320912d805394c472661ab20c00994116b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -410,6 +410,7 @@ public final class CraftServer implements Server { @@ -410,6 +410,7 @@ public final class CraftServer implements Server {
@@ -24,7 +24,7 @@ index 7960433f8278e3bd0ec43db3d3820ff2740a7c13..c6303baeefcbe85cde815fef02d1fcd7
} catch (Throwable ex) { } catch (Throwable ex) {
Logger.getLogger(CraftServer.class.getName()).log(Level.SEVERE, ex.getMessage() + " initializing " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex); Logger.getLogger(CraftServer.class.getName()).log(Level.SEVERE, ex.getMessage() + " initializing " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
} }
@@ -430,6 +432,31 @@ public final class CraftServer implements Server { @@ -430,6 +432,43 @@ public final class CraftServer implements Server {
} else { } else {
pluginFolder.mkdir(); pluginFolder.mkdir();
} }
@@ -33,16 +33,28 @@ index 7960433f8278e3bd0ec43db3d3820ff2740a7c13..c6303baeefcbe85cde815fef02d1fcd7
+ if (!sparkLoaded) { + if (!sparkLoaded) {
+ try { + try {
+ File file = new File("cache", "spark.jar"); + File file = new File("cache", "spark.jar");
+ try (java.io.BufferedInputStream in = new java.io.BufferedInputStream(new java.net.URL("https://sparkapi.lucko.me/download/bukkit").openStream()); java.io.FileOutputStream out = new java.io.FileOutputStream(file)) { + file.getParentFile().mkdirs();
+ byte[] dataBuffer = new byte[1024]; +
+ int bytesRead; + boolean shouldDownload = true;
+ while ((bytesRead = in.read(dataBuffer, 0, 1024)) != -1) { + if (file.exists()) {
+ out.write(dataBuffer, 0, bytesRead); + 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(""));
+ }
+
+ System.out.println("File SHA1: " + fileSha1);
+ System.out.println("Spark SHA1: " + sparkSha1);
+
+ if (fileSha1.equals(sparkSha1)) {
+ shouldDownload = false;
+ } + }
+ out.flush();
+ } catch (IOException e) {
+ e.printStackTrace();
+ } + }
+
+ 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);
+ }
+
+ Plugin spark = this.pluginManager.loadPlugin(file); + Plugin spark = this.pluginManager.loadPlugin(file);
+ String message = String.format("Loading %s", spark.getDescription().getFullName()); + String message = String.format("Loading %s", spark.getDescription().getFullName());
+ spark.getLogger().info(message); + spark.getLogger().info(message);