SpigotMC#2520: Fix ConcurrentModificationException when tasks are can…

…celled during shutdown
HexagonMC · Aug 28, 2018 · 16b3490 · 16b3490
1 parent 1bb8261
commit 16b3490
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/proxy/src/main/java/net/md_5/bungee/scheduler/BungeeScheduler.java b/proxy/src/main/java/net/md_5/bungee/scheduler/BungeeScheduler.java
@@ -62,9 +62,12 @@ public void cancel(ScheduledTask task)
     public int cancel(Plugin plugin)
     {
         Set<ScheduledTask> toRemove = new HashSet<>();
-        for ( ScheduledTask task : tasksByPlugin.get( plugin ) )
+        synchronized ( lock )
         {
-            toRemove.add( task );
+            for ( ScheduledTask task : tasksByPlugin.get( plugin ) )
+            {
+                toRemove.add( task );
+            }
         }
         for ( ScheduledTask task : toRemove )
         {