geforkt von Mirrors/Paper
aa52bf9e33
Mojang made some changes to priorities in 1.17 and it seems that these changes conflict with the changes made in this patch, which in some cases appears to cause excessive rescheduling of tasks. This, however, is not confirmed as such but seems to be the behavior that we're seeing to cause this issue, if mojang has adopted the changes we suggested, then a good chunk of this patch may be unneeded, but, this needs a much better look than I'm currently able to do
27 Zeilen
1.3 KiB
Diff
27 Zeilen
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aleksander Jagiello <themolkapl@gmail.com>
|
|
Date: Sun, 24 Jan 2021 22:17:54 +0100
|
|
Subject: [PATCH] Add getMainThreadExecutor to BukkitScheduler
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
|
index a423970cf7c927ea8a1bf842aaa236d3cf2d54c2..cdefb2025eedea7e204d70d568adaf1c1ec4c03c 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
|
@@ -655,4 +655,15 @@ public class CraftScheduler implements BukkitScheduler {
|
|
public BukkitTask runTaskTimerAsynchronously(Plugin plugin, BukkitRunnable task, long delay, long period) throws IllegalArgumentException {
|
|
throw new UnsupportedOperationException("Use BukkitRunnable#runTaskTimerAsynchronously(Plugin, long, long)");
|
|
}
|
|
+
|
|
+ // Paper start - add getMainThreadExecutor
|
|
+ @Override
|
|
+ public Executor getMainThreadExecutor(Plugin plugin) {
|
|
+ Validate.notNull(plugin, "Plugin cannot be null");
|
|
+ return command -> {
|
|
+ Validate.notNull(command, "Command cannot be null");
|
|
+ this.runTask(plugin, command);
|
|
+ };
|
|
+ }
|
|
+ // Paper end
|
|
}
|