summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblablubbabc <lukas@wirsindwir.de>2017-08-29 13:19:14 +0200
committermd_5 <git@md-5.net>2017-09-28 16:18:45 +1000
commitee91bce15792ca982f33a05587508b41f0030cbb (patch)
treeebaa529c1851c6a393c84db5cad034fb968aa37a
parent94b098085269b86ae8f926fe64e06fa3fbe6a7ca (diff)
downloadcraftbukkit-ee91bce15792ca982f33a05587508b41f0030cbb.tar
craftbukkit-ee91bce15792ca982f33a05587508b41f0030cbb.tar.gz
craftbukkit-ee91bce15792ca982f33a05587508b41f0030cbb.tar.lz
craftbukkit-ee91bce15792ca982f33a05587508b41f0030cbb.tar.xz
craftbukkit-ee91bce15792ca982f33a05587508b41f0030cbb.zip
Fix active async tasks not cancelled by CraftScheduler#cancelTasks(Plugin)
-rw-r--r--src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index edd7c74d..c5d751e9 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -226,7 +226,7 @@ public class CraftScheduler implements BukkitScheduler {
handle(task, 0l);
for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
if (taskPending == task) {
- return;
+ break;
}
if (taskPending.getTaskId() != -1 && taskPending.getOwner().equals(plugin)) {
taskPending.cancel0();