Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-01 06:53:44 +01:00
Code Issues Projects Releases Wiki Activity

Merge patches

Browse Source
This commit is contained in:
Spottedleaf 2024-10-24 08:20:45 -07:00
parent ecf4d9715e
commit 8e569ba62a
7 changed files with 6876 additions and 17497 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1263
patches/server/0822-fixup-MC-Utils.patch
View File

File diff suppressed because it is too large Load Diff

4
patches/server/0824-fixup-Paper-config-files.patch → patches/server/0822-fixup-Paper-config-files.patch
View File

@ -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); +
} }
} }

1334
patches/server/0823-fixup-MC-Utils.patch
View File

File diff suppressed because it is too large Load Diff

0
patches/server/0825-Rewrite-dataconverter-system.patch → patches/server/0824-Rewrite-dataconverter-system.patch
View File

0
patches/server/0827-fixup-Optimize-BlockPosition-helper-methods.patch → patches/server/0825-fixup-Optimize-BlockPosition-helper-methods.patch
View File

8421
patches/server/0826-Moonrise-optimisation-patches.patch
View File

File diff suppressed because it is too large Load Diff

13349
patches/server/0828-fixup-Moonrise-optimisation-patches.patch
View File

File diff suppressed because it is too large Load Diff