mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-15 04:05:50 -07:00
Fixes a deadlock issue in CraftScheduler
By: Raphfrk <raphfrk@gmail.com>
This commit is contained in:
@@ -20,6 +20,7 @@ public class CraftScheduler implements BukkitScheduler, Runnable {
|
||||
private final CraftThreadManager craftThreadManager = new CraftThreadManager();
|
||||
|
||||
private final LinkedList<Runnable> mainThreadQueue = new LinkedList<Runnable>();
|
||||
private final LinkedList<Runnable> syncedTasks = new LinkedList<Runnable>();
|
||||
|
||||
private final TreeMap<CraftTask,Boolean> schedulerQueue = new TreeMap<CraftTask,Boolean>();
|
||||
|
||||
@@ -111,11 +112,14 @@ public class CraftScheduler implements BukkitScheduler, Runnable {
|
||||
try {
|
||||
this.currentTick = currentTick;
|
||||
while (!mainThreadQueue.isEmpty()) {
|
||||
mainThreadQueue.removeFirst().run();
|
||||
syncedTasks.addLast(mainThreadQueue.removeFirst());
|
||||
}
|
||||
} finally {
|
||||
mainThreadLock.unlock();
|
||||
}
|
||||
while(!syncedTasks.isEmpty()) {
|
||||
syncedTasks.removeFirst().run();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user