Fixed multi-colored particle; Fixed gifts bug; Updated config

Author: MelonCode

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

@@ -1,11 +1,25 @@
 package ru.meloncode.xmas;
 
+import org.bukkit.Color;
 import org.bukkit.Location;
 import org.bukkit.Particle;
+import org.bukkit.Particle.DustOptions;
 import org.bukkit.entity.Player;
 
+import java.util.Random;
+
 public class ParticleContainer {
 
+    final static DustOptions[] COLORS = new DustOptions[]{
+            new DustOptions(Color.LIME, 1f),
+            new DustOptions(Color.RED, 1f),
+            new DustOptions(Color.AQUA, 1f),
+            new DustOptions(Color.YELLOW, 1f),
+            new DustOptions(Color.BLUE, 1f),
+            new DustOptions(Color.FUCHSIA, 1f)
+    };
+    final static Random random = new Random("Happy 2019!".hashCode());
+
     private final Particle type;
     private final float offsetX;
     private final float offsetY;
@@ -28,7 +42,11 @@ public void playEffect(Location location) {
         for (Player player : location.getWorld().getPlayers())
             if (player.getLocation().distance(location) < 16) {
                 try {
-                    player.spawnParticle(type, location, count, offsetX, offsetY, offsetZ, speed);
+                    if (type == Particle.REDSTONE) {
+                        player.spawnParticle(type, location, count, offsetX, offsetY, offsetZ, speed, COLORS[random.nextInt(6)]);
+                    } else {
+                        player.spawnParticle(type, location, count, offsetX, offsetY, offsetZ, speed);
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

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

@@ -1,16 +1,20 @@
 package ru.meloncode.xmas;
 
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.TileEntitySkull;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.SkullType;
-import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.Skull;
+import org.bukkit.craftbukkit.v1_13_R2.CraftWorld;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import ru.meloncode.xmas.utils.TextUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
 class XMas {
@@ -38,15 +42,16 @@ public static void removeTree(MagicTree tree) {
         TreeSerializer.removeTree(tree);
         trees.remove(tree.getTreeUID());
     }
-
     public static void processPresent(Block block, Player player) {
-        if (block.getType() == Material.SKULL) {
+        if (block.getType() == Material.PLAYER_HEAD) {
             Skull skull = (Skull) block.getState();
-            if (skull.getSkullType() == SkullType.PLAYER) {
-                if (Main.getHeads().contains(skull.getOwner())) {
+            TileEntitySkull skullTile = (TileEntitySkull) ((CraftWorld)skull.getWorld()).getHandle().getTileEntity(new BlockPosition(skull.getX(), skull.getY(), skull.getZ()));
+            if(skullTile != null && skullTile.getGameProfile() != null) {
+                if (Main.getHeads().contains(skullTile.getGameProfile().getName())) {
                     Location loc = block.getLocation();
                     if ((Main.RANDOM.nextFloat()) < Main.LUCK_CHANCE || !Main.LUCK_CHANCE_ENABLED) {
-                        loc.getWorld().dropItemNaturally(loc, new ItemStack(Main.gifts.get(Main.RANDOM.nextInt(Main.gifts.size()))));
+                        loc.getWorld().dropItemNaturally(loc,
+                                new ItemStack(Main.gifts.get(Main.RANDOM.nextInt(Main.gifts.size()))));
                         Effects.TREE_SWAG.playEffect(loc);
                         TextUtils.sendMessage(player, LocaleManager.GIFT_LUCK);
                     } else {

src/main/resources/config.yml

@@ -11,7 +11,7 @@ core:
  holiday-ends:
   enabled: true
 #DD.MM.YYYY HH-MM-SS
-  date: 10-01-2018 03-33-33
+  date: 10-01-2019 03-33-33
 # if true - plugin will summon chest with spent resources under tree
   resource-back: true
 
@@ -64,7 +64,7 @@ xmas:
     DIAMOND: 3
     GOLD_INGOT: 5
     BLAZE_POWDER: 10
-    SNOW_BALL: 30
+    SNOWBALL: 30
   tree:
    gift-cooldown: 180
    lvlup: