wzp/Folia
1
0
Fork 0
mirror of https://github.com/PaperMC/Folia.git synced 2025-04-23 04:39:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Force prefer spark plugin

Browse Source 
This allows the spark plugin to be loaded without setting
the startup flag
This commit is contained in:
Spottedleaf 2024-08-01 05:51:20 -07:00
parent dafae4f54a
commit 177c892d77
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
patches/server/0018-Disable-spark-profiler.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Disable spark profiler
It's not thread-safe. The plugin instead needs to be used. 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 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 --- a/src/main/java/io/papermc/paper/SparksFly.java
+++ b/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 { @@ -108,7 +108,7 @@ public final class SparksFly {
@ -14,7 +14,16 @@ index c7c396a7a94c35d973eb0796f8aba6e669ed5b7c..4e8ef2aeca4d9e67e53868de720a17bf
private void enable() { private void enable() {
if (!this.enabled) { if (!this.enabled) {
- if (GlobalConfiguration.get().spark.enabled) { - if (GlobalConfiguration.get().spark.enabled) {
+ if (false) { // Folia - region threading + if (false) { // Folia - disable in-built spark profiler
this.enabled = true; this.enabled = true;
this.spark.enable(); this.spark.enable();
} else { } 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) {