e703b60287
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@128691a Deprecate log4j logger method in `Plugin` PaperMC/Paper@2a306f5 Add Multi Block Change API (#7333) PaperMC/Paper@feb72b8 Update ASM EventExecutor generator patch to respect event handler return types. Fixes #7311 (#7317) PaperMC/Paper@dcca6cb Make tag presets unmodifiable (#7378) PaperMC/Paper@60e46ab Fix NotePlayEvent (#5180) PaperMC/Paper@512995c Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7359) PaperMC/Paper@0a9602c [ci skip] Fix multiple ItemStack array nullability mistakes (#7055) PaperMC/Paper@9a19308 Lock Frozen Ticks API (#7207) PaperMC/Paper@a058ac0 Dolphin API (#7102) PaperMC/Paper@f6c7d53 Add configurable stronghold seed (#7334) PaperMC/Paper@7978121 More PotionEffectType API (#5737) PaperMC/Paper@9490475 Add STRUCTURE_TYPE registry entry (#6400) PaperMC/Paper@b164899 Update tiny-remapper PaperMC/Paper@f7dbd06 [ci skip] Update parameter mappings PaperMC/Paper@ca523ab [ci skip] Fix param mismatch from last commit PaperMC/Paper@2e99e5e Updated Upstream (Bukkit/CraftBukkit) (#7411) PaperMC/Paper@41263d9 [ci skip] Update paperweight to 1.3.4 PaperMC/Paper@3109dd8 Updated Upstream (Bukkit/CraftBukkit) (#7428) PaperMC/Paper@17eb884 Use a CHM for StructureTemplate.Pallete cache PaperMC/Paper@f79c0da Updated Upstream (Bukkit/CraftBukkit) PaperMC/Paper@2121aed Rebuild patches PaperMC/Paper@2ec04e0 Use correct headerLocation for regionfile initialisation PaperMC/Paper@f23c039 Fix infinite recursion in spawnCategoryForChunk/Position PaperMC/Paper@9940bca API for creating command sender which forwards feedback (#7432) PaperMC/Paper@46ed080 fix portal linking in upgraded chunks (fixes #7419) (#7438) PaperMC/Paper@6df4641 Use destination world when preloading spawn chunk (#7441) PaperMC/Paper@0cc2503 Implement World#regenerateChunk (#7425) PaperMC/Paper@00da098 Log exceptions thrown during chat processing (#7467) PaperMC/Paper@26734e8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7454) PaperMC/Paper@4a745f9 Optimize Util#sequence (#7115) PaperMC/Paper@2c8d48c Make Panda implement Sittable (#7414) PaperMC/Paper@2c4a589 Fix issues with LimitedRegion (#7343) PaperMC/Paper@3d91eca Fix cancelled snow bucket placement (#6751) PaperMC/Paper@9567753 Don't load plugins prefixed with a dot (#7392) PaperMC/Paper@92c777d Fix PlayerProfile BukkitObject serialization, deprecate setName and setId for removal (#7471) PaperMC/Paper@e6898ff Fix IllegalArgumentException for /paper mobcaps command (#7472) PaperMC/Paper@a8f2d67 - properly fix IllegalArgumentException in `/paper mobcaps` command
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
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/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index a62c27777672eff1c488517b37876e3a44a2d57d..6d0e9ac4b48c81c9bbf1b0cfee9aac2bc70ba48d 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1996,4 +1996,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
@NotNull
|
|
io.papermc.paper.datapack.DatapackManager getDatapackManager();
|
|
// Paper end
|
|
+
|
|
+ // Parchment start
|
|
+ /**
|
|
+ * Gets the executor which runs tasks on an asynchronous thread pool.
|
|
+ * @return async executor
|
|
+ */
|
|
+ @NotNull
|
|
+ java.util.concurrent.Executor getAsyncExecutor();
|
|
+
|
|
+ /**
|
|
+ * Gets the executor which runs tasks on the main thread.
|
|
+ * @return main executor
|
|
+ */
|
|
+ @NotNull
|
|
+ java.util.concurrent.Executor getMainExecutor();
|
|
+ // Parchment end
|
|
}
|