Updated Upstream (Bukkit/CraftBukkit/Spigot)

This commit is contained in:
Jake Potrebic 2021-12-31 19:05:42 -08:00 committed by GitHub
parent 8b1734123e
commit 3a43821c38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
859 changed files with 561 additions and 656 deletions

View file

@ -0,0 +1,26 @@
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 c239c4de617933d20f75c33f943ba4a88954144e..1ea49965bf72edd862dc0d43e42c61df80966e45 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
}