we good to go now

This commit is contained in:
Ben Kerllenevich
2022-06-25 21:40:02 -04:00
parent 016cc5a2ee
commit fe8e40410b

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Spark Profiler
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 00d128eba3e778927bc33b71c1145051a0c142f5..a6d4f55799ca04d9c33292db80bd6dfc3f943330 100644 index 00d128eba3e778927bc33b71c1145051a0c142f5..da7264bb973303970cc4f04089b2715b7c5435bd 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -75,6 +75,18 @@ tasks.withType<JavaCompile> { @@ -75,6 +75,18 @@ tasks.withType<JavaCompile> {
@@ -19,7 +19,7 @@ index 00d128eba3e778927bc33b71c1145051a0c142f5..a6d4f55799ca04d9c33292db80bd6dfc
+ Files.createDirectories(dir) + Files.createDirectories(dir)
+ +
+ val target = dir.resolve("spark.jar") + val target = dir.resolve("spark.jar")
+ download.get().download(uri("https://ci.lucko.me/job/spark/317/artifact/spark-bukkit/build/libs/spark-1.9.15-bukkit.jar"), target) + download.get().download(uri(providers.gradleProperty("sparkUrl")), target)
+ } + }
+} +}
+// Purpur end +// Purpur end
@@ -28,7 +28,7 @@ index 00d128eba3e778927bc33b71c1145051a0c142f5..a6d4f55799ca04d9c33292db80bd6dfc
archiveClassifier.set("dev") archiveClassifier.set("dev")
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..80db19122109f877b8cc0f2d7a89af7f2ce24c2d 100644 index 7960433f8278e3bd0ec43db3d3820ff2740a7c13..d75db7d4a57e605f9f58b650ad2baeb866ede715 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
@@ -23,6 +23,7 @@ import java.io.FileInputStream; @@ -23,6 +23,7 @@ import java.io.FileInputStream;
@@ -72,7 +72,7 @@ index 7960433f8278e3bd0ec43db3d3820ff2740a7c13..80db19122109f877b8cc0f2d7a89af7f
+ // Purpur start + // Purpur start
+ if (!sparkLoaded) { + if (!sparkLoaded) {
+ try { + try {
+ File file = new File(getClass().getResource("/plugins/spark.jar").toURI()); + File file = new File(getClass().getClassLoader().getResource("plugins/spark.jar").toURI());
+ 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());