OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 23:38:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixes a deadlock issue in CraftScheduler

Browse source 
By: Raphfrk <raphfrk@gmail.com>
This commit is contained in:
CraftBukkit/Spigot 2011-02-13 03:45:34 +00:00
parent afd79ce40e
commit 85e1d48e88
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,7 @@ public class CraftScheduler implements BukkitScheduler, Runnable {
private final CraftThreadManager craftThreadManager = new CraftThreadManager(); private final CraftThreadManager craftThreadManager = new CraftThreadManager();
private final LinkedList<Runnable> mainThreadQueue = new LinkedList<Runnable>(); 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>(); private final TreeMap<CraftTask,Boolean> schedulerQueue = new TreeMap<CraftTask,Boolean>();
@ -111,11 +112,14 @@ public class CraftScheduler implements BukkitScheduler, Runnable {
try { try {
this.currentTick = currentTick; this.currentTick = currentTick;
while (!mainThreadQueue.isEmpty()) { while (!mainThreadQueue.isEmpty()) {
mainThreadQueue.removeFirst().run(); syncedTasks.addLast(mainThreadQueue.removeFirst());
} }
} finally { } finally {
mainThreadLock.unlock(); mainThreadLock.unlock();
} }
while(!syncedTasks.isEmpty()) {
syncedTasks.removeFirst().run();
}
} }
} }