Merge pull request #81 from Invvk/bug/entity-flag

Author: Invvk

WGEF-Core/src/main/java/io/github/invvk/wgef/listeners/EntityBreakListener.java

@@ -3,6 +3,7 @@
 import org.bukkit.Location;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
 import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -15,6 +16,8 @@
 import io.github.invvk.wgef.abstraction.WGEFUtils;
 import io.github.invvk.wgef.abstraction.flags.WGEFlags;
 
+import java.util.Objects;
+
 public final class EntityBreakListener implements Listener {
 
     private final WGEFPlugin plugin;
@@ -26,11 +29,15 @@ public EntityBreakListener(WGEFPlugin plugin) {
 
     @EventHandler(priority = EventPriority.LOWEST)
     public void onEntityDamage(DamageEntityEvent e) {
-        if (!(e.getOriginalEvent() instanceof EntityDamageByEntityEvent original) || !(original.getDamager() instanceof Player damager)) {
+        if (!(e.getOriginalEvent() instanceof EntityDamageByEntityEvent original)) {
             return;
         }
 
-        e.setResult(resolveBreakResult(damager, e.getEntity().getType(), e.getTarget(), WGEFlags.ALLOW_ENTITY_DAMAGE, WGEFlags.DENY_ENTITY_DAMAGE));
+        if (original.getDamager() instanceof Player player) {
+            e.setResult(resolveBreakResult(player, e.getEntity().getType(), e.getTarget(), WGEFlags.ALLOW_ENTITY_DAMAGE, WGEFlags.DENY_ENTITY_DAMAGE));
+        } else if (original.getDamager() instanceof Projectile projectile && projectile.getShooter() instanceof Player player) {
+            e.setResult(resolveBreakResult(player, e.getEntity().getType(), e.getTarget(), WGEFlags.ALLOW_ENTITY_DAMAGE, WGEFlags.DENY_ENTITY_DAMAGE));
+        }
     }
 
     @EventHandler(priority = EventPriority.LOWEST)

build.gradle

@@ -9,7 +9,7 @@ plugins {
 }
 
 group 'io.github.invvk'
-version '2.5-stable'
+version '2.6-stable'
 
 repositories {
     mavenCentral()