mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-10-28 14:31:05 +01:00
f1d3c9d7a2
Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Tuinity Changes: 5994cb0 Updated Upstream (Paper) 7dfe18c Merge https://github.com/Spottedleaf/Tuinity into ver/1.16.3 ef4e59a Optimise tab complete Purpur Changes: 8726ad9 Updated Upstream (Paper)
59 lines
2.7 KiB
Diff
59 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
|
|
Date: Sat, 12 Sep 2020 11:12:23 +0800
|
|
Subject: [PATCH] Nuke Bootstrap thread pool
|
|
|
|
Co-authored-by: Ivan Pekov <ivan@mrivanplays.com>
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/DataConverterRegistry.java b/src/main/java/net/minecraft/server/DataConverterRegistry.java
|
|
index 48e31e9142ffeb2725af6b1f483de67410e25694..1b5b06cad7771a7d351aca0a009d902f23f07d9d 100644
|
|
--- a/src/main/java/net/minecraft/server/DataConverterRegistry.java
|
|
+++ b/src/main/java/net/minecraft/server/DataConverterRegistry.java
|
|
@@ -15,14 +15,15 @@ public class DataConverterRegistry {
|
|
|
|
private static final BiFunction<Integer, Schema, Schema> a = Schema::new;
|
|
private static final BiFunction<Integer, Schema, Schema> b = DataConverterSchemaNamed::new;
|
|
- private static final DataFixer c = b();
|
|
-
|
|
- private static DataFixer b() {
|
|
+ // Yatopia start
|
|
+ private static final DataFixer c;
|
|
+ static {
|
|
DataFixerBuilder datafixerbuilder = new DataFixerBuilder(SharedConstants.getGameVersion().getWorldVersion());
|
|
|
|
a(datafixerbuilder);
|
|
- return datafixerbuilder.build(SystemUtils.e());
|
|
+ c = datafixerbuilder.build(SystemUtils.getMainExecutor());
|
|
}
|
|
+ // Yatopia end
|
|
|
|
public static DataFixer getDataFixer() { return a(); } // Paper - OBFHELPER
|
|
public static DataFixer a() {
|
|
diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
|
|
index 869dcf1545601358a273a5cfb47afa88fa13a11c..cbb5bcbeaac5487c99b6f2171a5ba28ea7fe171a 100644
|
|
--- a/src/main/java/net/minecraft/server/SystemUtils.java
|
|
+++ b/src/main/java/net/minecraft/server/SystemUtils.java
|
|
@@ -48,7 +48,7 @@ import org.apache.logging.log4j.Logger;
|
|
public class SystemUtils {
|
|
|
|
private static final AtomicInteger c = new AtomicInteger(1);
|
|
- private static final ExecutorService d = a("Bootstrap", -2); // Paper - add -2 priority
|
|
+ //private static final ExecutorService d = a("Bootstrap", -2); // Paper - add -2 priority // Yatopia - nuke this shit
|
|
private static final ExecutorService e = a("Main", -1); // Paper - add -1 priority
|
|
private static final ExecutorService f = n();
|
|
public static LongSupplier a = System::nanoTime;
|
|
@@ -111,10 +111,13 @@ public class SystemUtils {
|
|
return (ExecutorService) object;
|
|
}
|
|
|
|
+ /* // Yatopia start - ditch this
|
|
public static Executor e() {
|
|
return SystemUtils.d;
|
|
}
|
|
+ */ // Yatopia end
|
|
|
|
+ public static Executor getMainExecutor() { return f(); } // Yatopia - OBFHELPER
|
|
public static Executor f() {
|
|
return SystemUtils.e;
|
|
}
|