From 1d8c4e8dafb2c497e31331b672c316d1c9f628ba Mon Sep 17 00:00:00 2001
From: Indyuce <cym.peyrat@yahoo.fr>
Date: Sat, 12 Feb 2022 23:16:59 +0100
Subject: [PATCH] !Support for unarmed damage with RDW

---
 .../mmoitems/comp/RealDualWieldHook.java      | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/main/java/net/Indyuce/mmoitems/comp/RealDualWieldHook.java b/src/main/java/net/Indyuce/mmoitems/comp/RealDualWieldHook.java
index c50177c2..8e62cf0a 100644
--- a/src/main/java/net/Indyuce/mmoitems/comp/RealDualWieldHook.java
+++ b/src/main/java/net/Indyuce/mmoitems/comp/RealDualWieldHook.java
@@ -6,19 +6,21 @@ import io.lumine.mythic.lib.api.item.NBTItem;
 import io.lumine.mythic.lib.api.player.EquipmentSlot;
 import io.lumine.mythic.lib.damage.DamageMetadata;
 import io.lumine.mythic.lib.damage.DamageType;
+import io.lumine.mythic.lib.damage.MeleeAttackMetadata;
 import io.lumine.mythic.lib.player.PlayerMetadata;
 import net.Indyuce.mmoitems.api.ItemAttackMetadata;
 import net.Indyuce.mmoitems.api.Type;
 import net.Indyuce.mmoitems.api.TypeSet;
 import net.Indyuce.mmoitems.api.interaction.weapon.Weapon;
 import net.Indyuce.mmoitems.api.player.PlayerData;
+import org.bukkit.Material;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Nullable;
 
 public class RealDualWieldHook implements Listener {
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
@@ -31,20 +33,15 @@ public class RealDualWieldHook implements Listener {
         if (event.getDamage() == 0 || !(event.getEntity() instanceof LivingEntity) || event.getEntity().hasMetadata("NPC") || event.getPlayer().hasMetadata("NPC"))
             return;
 
-        // Custom damage check
-        LivingEntity target = (LivingEntity) event.getEntity();
-        EntityDamageByEntityEvent damageEvent = new EntityDamageByEntityEvent(event.getPlayer(), event.getEntity(), EntityDamageEvent.DamageCause.ENTITY_ATTACK, event.getDamage());
-        if (MythicLib.plugin.getDamage().findInfo(damageEvent) != null)
-            return;
-
         /*
          * Must apply attack conditions before apply any effects. the event must
          * be cancelled before anything is applied
          */
         Player player = event.getPlayer();
         PlayerData playerData = PlayerData.get(player);
+        LivingEntity target = (LivingEntity) event.getEntity();
         NBTItem item = MythicLib.plugin.getVersion().getWrapper().getNBTItem(player.getInventory().getItemInMainHand());
-        ItemAttackMetadata attackMeta = null;
+        MeleeAttackMetadata attackMeta = null;
 
         if (item.hasType() && Type.get(item.getType()) != Type.BLOCK) {
             Weapon weapon = new Weapon(playerData, item);
@@ -66,14 +63,19 @@ public class RealDualWieldHook implements Listener {
         }
 
         // Cast on-hit abilities and add the extra damage to the damage event
-        (attackMeta == null ? attackMeta = getAttack(playerData, event) : attackMeta).applyEffects(item, target);
+        new ItemAttackMetadata(attackMeta == null ? attackMeta = getAttack(playerData, event) : attackMeta).applyEffects(item, target);
 
         // Finally update Bukkit event
         event.setDamage(attackMeta.getDamage().getDamage());
     }
 
-    private ItemAttackMetadata getAttack(PlayerData playerData, PlayerDamageEntityWithOffhandEvent event) {
+    private boolean isAir(@Nullable ItemStack item) {
+        return item == null || item.getType() == Material.AIR;
+    }
+
+    private MeleeAttackMetadata getAttack(PlayerData playerData, PlayerDamageEntityWithOffhandEvent event) {
         PlayerMetadata cachedStatMap = playerData.getMMOPlayerData().getStatMap().cache(EquipmentSlot.OFF_HAND);
-        return new ItemAttackMetadata(new DamageMetadata(event.getDamage(), DamageType.WEAPON, DamageType.PHYSICAL), cachedStatMap);
+        DamageType[] damageTypes = isAir(playerData.getPlayer().getInventory().getItemInOffHand()) ? new DamageType[]{DamageType.UNARMED, DamageType.PHYSICAL} : new DamageType[]{DamageType.WEAPON, DamageType.PHYSICAL};
+        return new MeleeAttackMetadata(new DamageMetadata(event.getDamage(), damageTypes), cachedStatMap);
     }
 }