Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-11 10:01:55 +01:00
Code Issues Projects Releases Wiki Activity

Fix isCurrentlyRunning for sync tasks

Browse Source 
Not sure where this would of ever been used, but for correctness sake.
This commit is contained in:
Aikar 2018-03-17 13:14:44 -04:00
parent 7241626ffd
commit 700c900cc3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/Improved-Async-Task-Scheduler.patch
View File

@ -204,7 +204,7 @@ index 000000000..cf5aada2f
+ } + }
+} +}
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index e47f4cca2..4a4159879 100644 index e47f4cca2..c3cb9e6d2 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -0,0 +0,0 @@ import java.util.concurrent.atomic.AtomicReference; @@ -0,0 +0,0 @@ import java.util.concurrent.atomic.AtomicReference;
@ -311,8 +311,10 @@ index e47f4cca2..4a4159879 100644
public boolean isCurrentlyRunning(final int taskId) { public boolean isCurrentlyRunning(final int taskId) {
+ // Paper start + // Paper start
+ if (!isAsyncScheduler) { //noinspection TailRecursion + if (!isAsyncScheduler) {
+ return this.asyncScheduler.isCurrentlyRunning(taskId); + if (this.asyncScheduler.isCurrentlyRunning(taskId)) {
+ return true;
+ }
+ } + }
+ // Paper end + // Paper end
final CraftTask task = runners.get(taskId); final CraftTask task = runners.get(taskId);