mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 13:07:06 +01:00
26734e83b0
* Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 8085edde SPIGOT-6918: Add SpawnCategory API and configurations for Axolotls 04c7e13c PR-719: Add Player Profile API 71564210 SPIGOT-6910: Add BlockDamageAbortEvent CraftBukkit Changes: febaa1c6 SPIGOT-6918: Add SpawnCategory API and configurations for Axolotls 9dafd109 Don't send updates over large distances bdac46b0 SPIGOT-6782: EntityPortalEvent should not destroy entity when setTo() uses same world as getFrom() 8f361ece PR-1002: Add Player Profile API 911875d4 Increase outdated build delay e5f8a767 SPIGOT-6917: Use main scoreboard for /trigger a672a531 Clean up callBlockDamageEvent 8e1bdeef SPIGOT-6910: Add BlockDamageAbortEvent Spigot Changes: 6edb62f3 Rebuild patches 7fbc6a1e Rebuild patches * Updated Upstream (CraftBukkit) 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 CraftBukkit Changes: de951355 SPIGOT-6927: Fix default value of spawn-limits in Worlds
26 lines
1.2 KiB
Diff
26 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
|
|
}
|