fix FireworkDeathEvent

fantahund · May 13, 2024 · 26f8aec · 26f8aec
1 parent d1a4584
commit 26f8aec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/de/fanta/fancyfirework/events/FireworkDeathEvent.java b/src/main/java/de/fanta/fancyfirework/events/FireworkDeathEvent.java
@@ -1,5 +1,6 @@
 package de.fanta.fancyfirework.events;
 
+import org.bukkit.damage.DamageSource;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.entity.EntityDeathEvent;
@@ -11,8 +12,8 @@ public class FireworkDeathEvent extends EntityDeathEvent implements Cancellable
 
     private boolean cancelled;
 
-    public FireworkDeathEvent(ArmorStand stand, List<ItemStack> drops) {
-        super(stand, drops);
+    public FireworkDeathEvent(ArmorStand stand, List<ItemStack> drops, DamageSource damageSource) {
+        super(stand, damageSource, drops);
     }
 
     @Override

diff --git a/src/main/java/de/fanta/fancyfirework/listners/FireworkListener.java b/src/main/java/de/fanta/fancyfirework/listners/FireworkListener.java
@@ -18,6 +18,8 @@
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.DoubleChest;
+import org.bukkit.damage.DamageSource;
+import org.bukkit.damage.DamageType;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Entity;
@@ -253,7 +255,7 @@ public void onInteractItem(PlayerInteractEvent e) {
 
     private void damageFNS(Player player, EquipmentSlot slot) {
         ItemStack stack = player.getEquipment().getItem(slot);
-        if (player.getGameMode() != GameMode.CREATIVE) {
+        if (player.getGameMode() != GameMode.CREATIVE || stack.getItemMeta().isUnbreakable()) {
             ItemMeta meta = stack.getItemMeta();
             int maxDurability = stack.getType().getMaxDurability();
             if (maxDurability > 0) {
@@ -307,7 +309,8 @@ public void onDamage(EntityDamageByEntityEvent e) {
                 List<ItemStack> stackList = new ArrayList<>();
                 stackList.add(stack);
                 stand.setLastDamageCause(e);
-                FireworkDeathEvent fireworkDeathEvent = new FireworkDeathEvent(stand, stackList);
+                DamageSource damageSource = DamageSource.builder(DamageType.PLAYER_ATTACK).withCausingEntity(player).withDirectEntity(player).withDamageLocation(stand.getLocation()).build();
+                FireworkDeathEvent fireworkDeathEvent = new FireworkDeathEvent(stand, stackList, damageSource);
                 player.getServer().getPluginManager().callEvent(fireworkDeathEvent);
                 if (fireworkDeathEvent.isCancelled()) {
                     e.setCancelled(true);