Optimization (4 PR in one)

Author: LoneDev6

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

@@ -261,4 +261,18 @@ public void onSaplingGrow(StructureGrowEvent event) {
         }
     }
 
+    @EventHandler
+    public void disableDecay(LeavesDecayEvent e)
+    {
+        if(e.isCancelled())
+            return;
+
+        if(e.getBlock().getType() != Material.SPRUCE_LEAVES)
+            return;
+
+        if (MagicTree.isBlockBelongs(e.getBlock().getLocation().getBlock()))
+            e.setCancelled(true);
+    }
+
+
 }

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

@@ -0,0 +1,24 @@
+package ru.meloncode.xmas;
+
+import org.bukkit.scheduler.BukkitRunnable;
+
+class MagicTaskParticles extends BukkitRunnable {
+
+    private final Main xmas;
+
+    MagicTaskParticles(Main main) {
+        this.xmas = main;
+    }
+
+    @Override
+    public void run() {
+        if (Main.inProgress)
+            for (MagicTree tree : XMas.getAllTrees()) {
+                tree.playParticles();
+            }
+        if ((Main.autoEnd && Main.endTime < System.currentTimeMillis()) || !Main.inProgress) {
+            xmas.end();
+            cancel();
+        }
+    }
+}

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

@@ -106,23 +106,28 @@ public void update() {
                 }
                 presentCounter--;
             }
+        }
+    }
 
-            if (blocks != null && blocks.size() > 0) {
-                for (Block block : blocks) {
-                    if (block.getType() == Material.SPRUCE_LEAVES) {
-                        if (level.getSwagEffect() != null) {
-                            level.getSwagEffect().playEffect(block.getLocation());
-                        }
-                    }
-                    if (block.getType() == Material.SPRUCE_LOG) {
-                        if (level.getBodyEffect() != null) {
-                            level.getBodyEffect().playEffect(block.getLocation());
-                        }
+    public void playParticles()
+    {
+        if (blocks != null && blocks.size() > 0) {
+            for (Block block : blocks) {
+                if(!block.getChunk().isLoaded())
+                    continue;
+                if (block.getType() == Material.SPRUCE_LEAVES) {
+                    if (level.getSwagEffect() != null) {
+                        level.getSwagEffect().playEffect(block.getLocation());
                     }
-                    if (level.getAmbientEffect() != null) {
-                        level.getAmbientEffect().playEffect(location.clone().add(0, level.getTreeHeight(), 0));
+                }
+                if (block.getType() == Material.SPRUCE_LOG) {
+                    if (level.getBodyEffect() != null) {
+                        level.getBodyEffect().playEffect(block.getLocation());
                     }
                 }
+                if (level.getAmbientEffect() != null) {
+                    level.getAmbientEffect().playEffect(location.clone().add(0, level.getTreeHeight(), 0));
+                }
             }
         }
     }

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

@@ -34,6 +34,8 @@ 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;
     private FileConfiguration config;
@@ -67,6 +69,13 @@ 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);
+        
         autoEnd = config.getBoolean("core.holiday-ends.enabled");
         resourceBack = config.getBoolean("core.holiday-ends.resource-back");
         MAX_TREE_COUNT = config.getInt("core.tree-limit");
@@ -118,7 +127,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, UPDATE_SPEED);
+        new MagicTask(this).runTaskTimer(this, 5, TASK_DELAY);
+        new MagicTaskParticles(this).runTaskTimer(this, 5, PARTICLES_DELAY);
         XMas.XMAS_CRYSTAL = new ItemMaker(Material.EMERALD, LocaleManager.CRYSTAL_NAME, LocaleManager.CRYSTAL_LORE).make();
 
         ShapedRecipe grinderRecipe;