Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
Merge patches
Dieser Commit ist enthalten in:
Ursprung
ecf4d9715e
Commit
8e569ba62a
Datei-Diff unterdrückt, da er zu groß ist
Diff laden
@ -5,7 +5,7 @@ Subject: [PATCH] fixup! Paper config files
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
||||||
index 73e8a524925ed6f2580d3bd01616646fabafda78..4bfe7e987450afa433fcad1847f6130654769416 100644
|
index 73e8a524925ed6f2580d3bd01616646fabafda78..61893f8216ddaedd899b573322f3ad0088074ac5 100644
|
||||||
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
||||||
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
||||||
@@ -30,6 +30,45 @@ public class GlobalConfiguration extends ConfigurationPart {
|
@@ -30,6 +30,45 @@ public class GlobalConfiguration extends ConfigurationPart {
|
||||||
@ -81,7 +81,7 @@ index 73e8a524925ed6f2580d3bd01616646fabafda78..4bfe7e987450afa433fcad1847f61306
|
|||||||
@PostProcess
|
@PostProcess
|
||||||
private void postProcess() {
|
private void postProcess() {
|
||||||
- //io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.init(this);
|
- //io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.init(this);
|
||||||
+ ca.spottedleaf.moonrise.patches.chunk_system.scheduling.ChunkTaskScheduler.init(this);
|
+
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Datei-Diff unterdrückt, da er zu groß ist
Diff laden
Datei-Diff unterdrückt, da er zu groß ist
Diff laden
Datei-Diff unterdrückt, da er zu groß ist
Diff laden
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren