mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-10 21:54:45 +02:00
928bcc8d3a
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
27 lines
1.2 KiB
Diff
27 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aleksander Jagiello <themolkapl@gmail.com>
|
|
Date: Sun, 24 Jan 2021 22:17:29 +0100
|
|
Subject: [PATCH] Add getMainThreadExecutor to BukkitScheduler
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/scheduler/BukkitScheduler.java b/src/main/java/org/bukkit/scheduler/BukkitScheduler.java
|
|
index 5aefb7f2de890673aea275e85dbae9a2422b59b1..d2ab2ee1e1e8fbaac4edef5b3ee313ee4ceb6991 100644
|
|
--- a/src/main/java/org/bukkit/scheduler/BukkitScheduler.java
|
|
+++ b/src/main/java/org/bukkit/scheduler/BukkitScheduler.java
|
|
@@ -457,4 +457,15 @@ public interface BukkitScheduler {
|
|
@Deprecated
|
|
@NotNull
|
|
public BukkitTask runTaskTimerAsynchronously(@NotNull Plugin plugin, @NotNull BukkitRunnable task, long delay, long period) throws IllegalArgumentException;
|
|
+
|
|
+ // Paper start - add getMainThreadExecutor
|
|
+ /**
|
|
+ * Returns an executor that will run tasks on the next server tick.
|
|
+ *
|
|
+ * @param plugin the reference to the plugin scheduling tasks
|
|
+ * @return an executor associated with the given plugin
|
|
+ */
|
|
+ @NotNull
|
|
+ public java.util.concurrent.Executor getMainThreadExecutor(@NotNull Plugin plugin);
|
|
+ // Paper end
|
|
}
|