Merge pull request MelonCode#10 from LoneDev6/master

Various fixes

Author: LoneDev6

pom.xml

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

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

@@ -3,10 +3,13 @@
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.*;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.ItemSpawnEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
@@ -40,6 +43,14 @@ public void onPlayerOpenPresent(PlayerInteractEvent event) {
         }
     }
 
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
+    public void onPlayerOpenPresent(BlockBreakEvent event) {
+        Block block = event.getBlock();
+        if (block != null && block.getType() == Material.PLAYER_HEAD) {
+            XMas.processPresent(block, event.getPlayer());
+        }
+    }
+
     // Prevent bonemeal on magic tree
     @EventHandler
     public void onPlayerUseBonemeal(PlayerInteractEvent event) {
@@ -152,10 +163,9 @@ public void onBlockBreakByExplosion(EntityExplodeEvent event) {
     @EventHandler
     public void onItemSpawn(ItemSpawnEvent event) {
         ItemStack item = event.getEntity().getItemStack();
-        // TODO Probably won't work
         if (item.getType() == Material.PLAYER_HEAD) {
             SkullMeta meta = (SkullMeta) item.getItemMeta();
-            if (meta.getOwningPlayer() != null && Main.getHeads().contains(meta.getOwningPlayer().getName())) {
+            if (meta.getOwner() != null && Main.getHeads().contains(meta.getOwner())) {
                 event.setCancelled(true);
             }
         }
@@ -274,5 +284,13 @@ public void disableDecay(LeavesDecayEvent e)
             e.setCancelled(true);
     }
 
-
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
+    private void disableFireworkDamage(EntityDamageByEntityEvent e)
+    {
+        if (e.getDamager().getType() == EntityType.FIREWORK) {
+            if (e.getDamager().hasMetadata("nodamage")) {
+                e.setCancelled(true);
+            }
+        }
+    }
 }

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

@@ -9,6 +9,7 @@
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.FireworkMeta;
+import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.util.Vector;
 
 import java.util.*;
@@ -153,6 +154,7 @@ private void levelUp() {
             FireworkMeta meta = fw.getFireworkMeta();
             meta.addEffect(FireworkEffect.builder().trail(true).withColor(Color.RED).withFade(Color.LIME).withFlicker().with(Type.BURST).build());
             fw.setFireworkMeta(meta);
+            fw.setMetadata("nodamage", new FixedMetadataValue(Main.getInstance(), true));
         }
         build();
         save();

src/main/resources/config.yml

@@ -11,7 +11,7 @@ core:
  holiday-ends:
   enabled: true
 #DD.MM.YYYY HH-MM-SS
-  date: 10-01-2020 03-33-33
+  date: 10-01-2021 03-33-33
 # if true - plugin will summon chest with spent resources under tree
   resource-back: true