From 28c9dcb36829bec1646cfd619f5994af75fa2f0f Mon Sep 17 00:00:00 2001 From: Ben Kerllenevich Date: Sun, 26 Jun 2022 07:04:13 -0400 Subject: [PATCH] update spark url --- gradle.properties | 1 - patches/server/0280-Spark-Profiler.patch | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 014eadb6e..261bc30b4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,6 @@ group = org.purpurmc.purpur version = 1.19-R0.1-SNAPSHOT paperCommit = 37afe987d9fff5af72ea6f16807aa271fe70fbf1 -sparkUrl = https://ci.lucko.me/job/spark/317/artifact/spark-bukkit/build/libs/spark-1.9.15-bukkit.jar org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0280-Spark-Profiler.patch b/patches/server/0280-Spark-Profiler.patch index 4deb4ae62..ba9c25a74 100644 --- a/patches/server/0280-Spark-Profiler.patch +++ b/patches/server/0280-Spark-Profiler.patch @@ -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 -index 7960433f8278e3bd0ec43db3d3820ff2740a7c13..a36462ce16822395a098c5f9569a7ceec350eba9 100644 +index 7960433f8278e3bd0ec43db3d3820ff2740a7c13..c6303baeefcbe85cde815fef02d1fcd78685ab7f 100644 --- a/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 { @@ -33,7 +33,7 @@ index 7960433f8278e3bd0ec43db3d3820ff2740a7c13..a36462ce16822395a098c5f9569a7cee + if (!sparkLoaded) { + try { + File file = new File("cache", "spark.jar"); -+ try (java.io.BufferedInputStream in = new java.io.BufferedInputStream(new java.net.URL("https://ci.lucko.me/job/spark/317/artifact/spark-bukkit/build/libs/spark-1.9.15-bukkit.jar").openStream()); java.io.FileOutputStream out = new java.io.FileOutputStream(file)) { ++ 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)) { + byte[] dataBuffer = new byte[1024]; + int bytesRead; + while ((bytesRead = in.read(dataBuffer, 0, 1024)) != -1) {