OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-09 19:49:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-3619: Improve CraftScheduler#isCurrentlyRunning

Browse source 
* No longer returns opposite of what it should
* Works for sync tasks as well

By: blablubbabc <lukas@wirsindwir.de>
This commit is contained in:
CraftBukkit/Spigot 2018-06-17 15:04:25 +02:00
parent 2fff732946
commit 0e8e610b0e
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
paper-server/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
View file

@ -74,6 +74,10 @@ public class CraftScheduler implements BukkitScheduler {
* These are tasks that are currently active. It's provided for 'viewing' the current state.
*/
private final ConcurrentHashMap<Integer, CraftTask> runners = new ConcurrentHashMap<Integer, CraftTask>();
/**
* The sync task that is currently running on the main thread.
*/
private volatile CraftTask currentTask = null;
private volatile int currentTick = -1;
private final Executor executor = Executors.newCachedThreadPool();
private CraftAsyncDebugger debugHead = new CraftAsyncDebugger(-1, null, null) {@Override StringBuilder debugTo(StringBuilder string) {return string;}};
@ -269,12 +273,15 @@ public class CraftScheduler implements BukkitScheduler {
public boolean isCurrentlyRunning(final int taskId) {
final CraftTask task = runners.get(taskId);
if (task == null || task.isSync()) {
if (task == null) {
return false;
}
if (task.isSync()) {
return (task == currentTask);
}
final CraftAsyncTask asyncTask = (CraftAsyncTask) task;
synchronized (asyncTask.getWorkers()) {
return asyncTask.getWorkers().isEmpty();
return !asyncTask.getWorkers().isEmpty();
}
}
@ -348,6 +355,7 @@ public class CraftScheduler implements BukkitScheduler {
continue;
}
if (task.isSync()) {
currentTask = task;
try {
task.run();
} catch (final Throwable throwable) {
@ -358,6 +366,8 @@ public class CraftScheduler implements BukkitScheduler {
task.getTaskId(),
task.getOwner().getDescription().getFullName()),
throwable);
} finally {
currentTask = null;
}
parsePending();
} else {