Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-01-08 07:27:39 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed consumables not casting skills

Browse Source
This commit is contained in:
Indyuce 2021-11-28 10:01:56 +01:00
parent 91f136774e
commit ad9af57ab7
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ import io.lumine.mythic.lib.api.item.NBTItem;
import io.lumine.mythic.lib.api.player.EquipmentSlot; import io.lumine.mythic.lib.api.player.EquipmentSlot;
import io.lumine.mythic.lib.comp.target.InteractionType; import io.lumine.mythic.lib.comp.target.InteractionType;
import io.lumine.mythic.lib.damage.MeleeAttackMetadata; import io.lumine.mythic.lib.damage.MeleeAttackMetadata;
import io.lumine.mythic.lib.skill.trigger.TriggerType;
import net.Indyuce.mmoitems.MMOItems; import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.MMOUtils; import net.Indyuce.mmoitems.MMOUtils;
import net.Indyuce.mmoitems.api.ItemAttackMetadata; import net.Indyuce.mmoitems.api.ItemAttackMetadata;
@ -79,7 +80,11 @@ public class ItemUse implements Listener {
} }
if (useItem instanceof Consumable) { if (useItem instanceof Consumable) {
// Since the interact event is cancelled, no skills is cast by MythicLib. They must be force-cast
event.setCancelled(true); event.setCancelled(true);
useItem.getPlayerData().getMMOPlayerData().triggerSkills(player.isSneaking() ? TriggerType.SHIFT_RIGHT_CLICK : TriggerType.RIGHT_CLICK, null);
Consumable.ConsumableConsumeResult result = ((Consumable) useItem).useOnPlayer(); Consumable.ConsumableConsumeResult result = ((Consumable) useItem).useOnPlayer();
if (result == Consumable.ConsumableConsumeResult.CANCEL) if (result == Consumable.ConsumableConsumeResult.CANCEL)
return; return;