diff --git a/patches/server/0018-Disable-spark-profiler.patch b/patches/server/0018-Disable-spark-profiler.patch index 78f9a091b..961061104 100644 --- a/patches/server/0018-Disable-spark-profiler.patch +++ b/patches/server/0018-Disable-spark-profiler.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Disable spark profiler It's not thread-safe. The plugin instead needs to be used. diff --git a/src/main/java/io/papermc/paper/SparksFly.java b/src/main/java/io/papermc/paper/SparksFly.java -index c7c396a7a94c35d973eb0796f8aba6e669ed5b7c..4e8ef2aeca4d9e67e53868de720a17bf08720ea0 100644 +index c7c396a7a94c35d973eb0796f8aba6e669ed5b7c..5e1eb6e1853ff19f26ca6f01dac77a05c804f539 100644 --- a/src/main/java/io/papermc/paper/SparksFly.java +++ b/src/main/java/io/papermc/paper/SparksFly.java @@ -108,7 +108,7 @@ public final class SparksFly { @@ -14,7 +14,16 @@ index c7c396a7a94c35d973eb0796f8aba6e669ed5b7c..4e8ef2aeca4d9e67e53868de720a17bf private void enable() { if (!this.enabled) { - if (GlobalConfiguration.get().spark.enabled) { -+ if (false) { // Folia - region threading ++ if (false) { // Folia - disable in-built spark profiler this.enabled = true; this.spark.enable(); } else { +@@ -160,7 +160,7 @@ public final class SparksFly { + } + + public static boolean isPluginPreferred() { +- return Boolean.getBoolean(PREFER_SPARK_PLUGIN_PROPERTY); ++ return true; // Folia - disable in-built spark profiler + } + + private static boolean isPluginEnabled(final Server server) {