Remove TASK_DELAY, remove event ending code from play particle task

Author: MelonCode

src/main/java/ru/meloncode/xmas/Main.java

@@ -34,7 +34,6 @@ public class Main extends JavaPlugin implements Listener {
     static long endTime;
     static boolean inProgress;
     private static int UPDATE_SPEED;
-    private static int TASK_DELAY;
     private static int PARTICLES_DELAY;
     private static List<String> heads;
     private static Plugin plugin;
@@ -69,9 +68,6 @@ public void onEnable() {
             config.set("core.update-speed", 7);
             UPDATE_SPEED = 7;
         }
-        TASK_DELAY = config.getInt("core.task-delay");
-        if (TASK_DELAY <= 0)
-            config.set("core.task-delay", 7);
         PARTICLES_DELAY = config.getInt("core.particles-delay");
         if (PARTICLES_DELAY <= 0)
             config.set("particles-delay", 35);
@@ -127,8 +123,8 @@ public void onEnable() {
         LUCK_CHANCE_ENABLED = config.getBoolean("xmas.luck.enabled");
         LUCK_CHANCE = (float) config.getInt("xmas.luck.chance") / 100;
         new Events().registerListener();
-        new MagicTask(this).runTaskTimer(this, 5, TASK_DELAY);
-        new MagicTaskParticles(this).runTaskTimerAsynchronously(this, 5, PARTICLES_DELAY);
+        new MagicTask(this).runTaskTimer(this, 5, UPDATE_SPEED);
+        new PlayParticlesTask(this).runTaskTimerAsynchronously(this, 5, PARTICLES_DELAY);
         XMas.XMAS_CRYSTAL = new ItemMaker(Material.EMERALD, LocaleManager.CRYSTAL_NAME, LocaleManager.CRYSTAL_LORE).make();
 
         ShapedRecipe grinderRecipe;
@@ -146,7 +142,7 @@ public void onEnable() {
         try {
             if (!registered)
                 getServer().addRecipe(grinderRecipe);
-        } catch (Exception e) {
+        } catch (Exception ignored) {
         }
         XMasCommand.register(this);
         TextUtils.sendConsoleMessage(LocaleManager.PLUGIN_ENABLED);

…u/meloncode/xmas/MagicTaskParticles.java …ru/meloncode/xmas/PlayParticlesTask.javasrc/main/java/ru/meloncode/xmas/MagicTaskParticles.java renamed to src/main/java/ru/meloncode/xmas/PlayParticlesTask.java src/main/java/ru/meloncode/xmas/MagicTaskParticles.java renamed to src/main/java/ru/meloncode/xmas/PlayParticlesTask.java

@@ -2,11 +2,11 @@
 
 import org.bukkit.scheduler.BukkitRunnable;
 
-class MagicTaskParticles extends BukkitRunnable {
+class PlayParticlesTask extends BukkitRunnable {
 
     private final Main xmas;
 
-    MagicTaskParticles(Main main) {
+    PlayParticlesTask(Main main) {
         this.xmas = main;
     }
 
@@ -16,9 +16,5 @@ public void run() {
             for (MagicTree tree : XMas.getAllTrees()) {
                 tree.playParticles();
             }
-        if ((Main.autoEnd && Main.endTime < System.currentTimeMillis()) || !Main.inProgress) {
-            xmas.end();
-            cancel();
-        }
     }
 }