Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 21:07:36 +01:00
Code Issues Projects Releases Wiki Activity

Fixed CraftScheduler to catch exceptions thrown by tasks, rather than crash the server.

Browse Source
This commit is contained in:
sk89q 2011-04-18 23:47:49 -07:00
parent 0048b22e44
commit a450dcbb83
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
View File

@ -8,6 +8,8 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.plugin.Plugin;
@ -17,12 +19,14 @@ import org.bukkit.craftbukkit.scheduler.CraftTask;
public class CraftScheduler implements BukkitScheduler, Runnable {
private static final Logger logger = Logger.getLogger("Minecraft");
private final CraftServer server;
private final CraftThreadManager craftThreadManager = new CraftThreadManager();
private final LinkedList<Runnable> mainThreadQueue = new LinkedList<Runnable>();
private final LinkedList<Runnable> syncedTasks = new LinkedList<Runnable>();
private final LinkedList<CraftTask> mainThreadQueue = new LinkedList<CraftTask>();
private final LinkedList<CraftTask> syncedTasks = new LinkedList<CraftTask>();
private final TreeMap<CraftTask,Boolean> schedulerQueue = new TreeMap<CraftTask,Boolean>();
@ -93,7 +97,7 @@ public class CraftScheduler implements BukkitScheduler, Runnable {
void processTask(CraftTask task) {
if (task.isSync()) {
addToMainThreadQueue(task.getTask());
addToMainThreadQueue(task);
} else {
craftThreadManager.executeTask(task.getTask(), task.getOwner(), task.getIdNumber());
}
@ -119,7 +123,18 @@ public class CraftScheduler implements BukkitScheduler, Runnable {
mainThreadLock.unlock();
}
while(!syncedTasks.isEmpty()) {
syncedTasks.removeFirst().run();
CraftTask task = syncedTasks.removeFirst();
try {
task.getTask().run();
} catch (Throwable t) {
// Bad plugin!
logger.log(Level.WARNING,
"Task of '" + task.getOwner().getDescription().getName()
+ "' generated an exception", t);
synchronized (schedulerQueue) {
schedulerQueue.remove(task);
}
}
}
}
}
@ -135,7 +150,7 @@ public class CraftScheduler implements BukkitScheduler, Runnable {
return tempTick;
}
void addToMainThreadQueue(Runnable task) {
void addToMainThreadQueue(CraftTask task) {
mainThreadLock.lock();
try {
mainThreadQueue.addLast(task);