Merge branch 'master' into pagination

SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemType.java

@@ -20,7 +20,6 @@
 package de.steamwar.schematicsystem;
 
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import de.steamwar.core.Core;
 import de.steamwar.core.VersionDependent;
 import de.steamwar.sql.NoClipboardException;
 import de.steamwar.sql.SchematicNode;
@@ -71,7 +70,7 @@ public class CheckSchemType {
     }
 
     static {
-        File folder = new File(Core.getInstance().getDataFolder().getParentFile(), "FightSystem");
+        File folder = new File(SchematicSystem.getInstance().getDataFolder().getParentFile(), "FightSystem");
 
         if(folder.exists()) {
             for(File configFile : folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))) {