Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-03-11 13:11:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Offhand ranged check for melee hits.

Browse Source
This commit is contained in:
Aria 2019-10-02 01:40:26 +02:00
parent 9ba20dd408
commit dccb394775
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/net/Indyuce/mmoitems/listener/ItemUse.java
View File

@ -118,7 +118,9 @@ public class ItemUse implements Listener {
*/ */
PlayerData playerData = PlayerData.get(player); PlayerData playerData = PlayerData.get(player);
NBTItem item = MMOItems.plugin.getNMS().getNBTItem(player.getInventory().getItemInMainHand()); NBTItem item = MMOItems.plugin.getNMS().getNBTItem(player.getInventory().getItemInMainHand());
NBTItem offhandItem = MMOItems.plugin.getNMS().getNBTItem(player.getInventory().getItemInOffHand());
AttackResult result = new AttackResult(event.getDamage(), DamageType.WEAPON, DamageType.PHYSICAL); AttackResult result = new AttackResult(event.getDamage(), DamageType.WEAPON, DamageType.PHYSICAL);
if (item.hasType()) { if (item.hasType()) {
Weapon weapon = new Weapon(playerData, item, item.getType()); Weapon weapon = new Weapon(playerData, item, item.getType());
@ -138,6 +140,19 @@ public class ItemUse implements Listener {
return; return;
} }
} }
if (offhandItem.hasType()) {
Weapon weapon = new Weapon(playerData, offhandItem, offhandItem.getType());
if(weapon.getMMOItem().getType().getItemSet() == TypeSet.RANGE) {
event.setCancelled(true);
return;
}
if (!weapon.canBeUsed()) {
event.setCancelled(true);
return;
}
}
/* /*
* cast on-hit abilities and add the extra damage to the damage event * cast on-hit abilities and add the extra damage to the damage event