50649b6a64
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@fb2c24b Updated Upstream (Bukkit/CraftBukkit) (#8015) PaperMC/Paper@4c9317c Use non-deprecated super ctor in PaperServerListPingEventImpl (#8029)
28 lines
968 B
Diff
28 lines
968 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: lexikiq <noellekiq@gmail.com>
|
|
Date: Sun, 20 Jun 2021 19:39:38 -0400
|
|
Subject: [PATCH] Expose MCUtil Executors
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index a50a6f14e03f2b709b36126af263b29c56fd9f51..1b3fb22d184555e765eb313e261d2d529564aaf2 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -2891,4 +2891,16 @@ public final class CraftServer implements Server {
|
|
}
|
|
|
|
// Paper end
|
|
+
|
|
+ // Parchment start
|
|
+ @Override
|
|
+ public java.util.concurrent.Executor getAsyncExecutor() {
|
|
+ return net.minecraft.server.MCUtil.asyncExecutor;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public java.util.concurrent.Executor getMainExecutor() {
|
|
+ return net.minecraft.server.MCUtil.MAIN_EXECUTOR;
|
|
+ }
|
|
+ // Parchment end
|
|
}
|