Possible fix for cancelled CraftScheduler tasks still running.

src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java

@@ -253,7 +253,11 @@ public class CraftScheduler implements BukkitScheduler, Runnable {
     }
 
     public void cancelTask(int taskId) {
+        syncedTasksLock.lock();
+        try {
             synchronized (schedulerQueue) {
+                mainThreadLock.lock();
+                try {
                     Iterator<CraftTask> itr = schedulerQueue.keySet().iterator();
                     while (itr.hasNext()) {
                         CraftTask current = itr.next();
@@ -261,7 +265,28 @@ public class CraftScheduler implements BukkitScheduler, Runnable {
                             itr.remove();
                         }
                     }
+                    itr = mainThreadQueue.iterator();
+                    while (itr.hasNext()) {
+                        CraftTask current = itr.next();
+                        if (current.getIdNumber() == taskId) {
+                            itr.remove();
                         }
+                    }
+                    itr = syncedTasks.iterator();
+                    while (itr.hasNext()) {
+                        CraftTask current = itr.next();
+                        if (current.getIdNumber() == taskId) {
+                            itr.remove();
+                        }
+                    }
+                } finally {
+                    mainThreadLock.unlock();
+                }
+            }
+        } finally {
+            syncedTasksLock.unlock();
+        }
+
         craftThreadManager.interruptTask(taskId);
     }