src/de/steamwar/bungeecore/BungeeCore.java

@@ -28,6 +28,7 @@ import de.steamwar.bungeecore.listeners.ping.PingListener;
 import de.steamwar.bungeecore.network.BungeeNetworkHandler;
 import de.steamwar.bungeecore.network.NetworkReceiver;
 import de.steamwar.bungeecore.network.SWScriptSyntaxForwarder;
+import de.steamwar.bungeecore.util.SchematicSearch;
 import de.steamwar.sql.Punishment;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserElo;
@@ -235,6 +236,7 @@ public class BungeeCore extends Plugin {
             tablistManager.disable();
         errorLogger.unregister();
         Statement.closeAll();
+        SchematicSearch.abortAll();
     }
 
     public static BungeeCore get() {

src/de/steamwar/bungeecore/util/SchematicSearch.java

@@ -65,6 +65,15 @@ public class SchematicSearch {
         }
     }
 
+    public static void abortAll() {
+        synchronized (searchQueue) {
+            searchQueue.clear();
+        }
+        if(currentSearch != null) {
+            currentSearch.end();
+        }
+    }
+
     private static List<String> constructArguments(SteamwarUser user, File pattern) {
         return Arrays.asList(searchBinary, "-T", "1", "-s", "-u", String.valueOf(user.getId()), "-o", "json:std", "-m", "50", pattern.getAbsolutePath());
     }