Merge pull request MelonCode#1 from MelonCode/master

got stuff from official repo

Author: LoneDev6

README.md

@@ -0,0 +1,16 @@
+# X-Mas
+
+![Image](http://puu.sh/dKlK1/85c3dad454.jpg)
+
+With this plugin you can plant your Christmas tree and upgrade it. Look for some gifts under it!
+
+[SpigotMC plugin page](https://www.spigotmc.org/resources/x-mas-upgradeable-christmas-tree-event.2672/) 
+
+## Authors
+
+* **MelonCode** - *Original dev* - [MelonCode](https://github.com/MelonCode)
+* **Ghost_chu** - *NMS fixes* - [Ghost_chu](https://github.com/Ghost-chu)
+* **LoneDev6** - *Optimization patches* - [LoneDev6](https://github.com/LoneDev6)
+* **montlikadani** - *Translation (hu)* - [montlikadani](https://github.com/montlikadani)
+
+See also the list of [contributors](https://github.com/MelonCode/X-Mas/graphs/contributors) who participated in this project.

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.meloncode</groupId>
     <artifactId>xmas</artifactId>
-    <version>2.3</version>
+    <version>2.4</version>
 
     <repositories>
         <repository>

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/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.getWorld().isChunkLoaded(block.getX() / 16, block.getZ() / 16))
+                    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,7 @@ public class Main extends JavaPlugin implements Listener {
     static long endTime;
     static boolean inProgress;
     private static int UPDATE_SPEED;
+    private static int PARTICLES_DELAY;
     private static List<String> heads;
     private static Plugin plugin;
     private FileConfiguration config;
@@ -67,6 +68,10 @@ public void onEnable() {
             config.set("core.update-speed", 7);
             UPDATE_SPEED = 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");
@@ -119,6 +124,7 @@ public void onEnable() {
         LUCK_CHANCE = (float) config.getInt("xmas.luck.chance") / 100;
         new Events().registerListener();
         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;
@@ -136,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);

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

@@ -0,0 +1,20 @@
+package ru.meloncode.xmas;
+
+import org.bukkit.scheduler.BukkitRunnable;
+
+class PlayParticlesTask extends BukkitRunnable {
+
+    private final Main xmas;
+
+    PlayParticlesTask(Main main) {
+        this.xmas = main;
+    }
+
+    @Override
+    public void run() {
+        if (Main.inProgress)
+            for (MagicTree tree : XMas.getAllTrees()) {
+                tree.playParticles();
+            }
+    }
+}

src/main/resources/config.yml

@@ -19,7 +19,8 @@ core:
  #I don't Recommend  to touch it.
  #20 = 1 update / sec
  #Can't be 0
- update-speed: 7 
+ update-speed: 7
+ particles-delay: 35
 xmas:
  luck:
   enabled: false
@@ -74,4 +75,4 @@ xmas:
     GLOWSTONE_DUST: 16
   magic_tree:
    gift-cooldown: 120
-   lvlup:
+   lvlup: