From 42826512100c70b34f2bc7d48c2df55891f0cf97 Mon Sep 17 00:00:00 2001 From: Indyuce Date: Thu, 7 Jul 2022 12:04:40 +0200 Subject: [PATCH] Fixed heroes skill damage being 0 --- .../java/net/Indyuce/mmoitems/comp/rpg/HeroesHook.java | 2 +- .../java/net/Indyuce/mmoitems/stat/type/ItemStat.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/Indyuce/mmoitems/comp/rpg/HeroesHook.java b/src/main/java/net/Indyuce/mmoitems/comp/rpg/HeroesHook.java index 65fda056..66f84608 100644 --- a/src/main/java/net/Indyuce/mmoitems/comp/rpg/HeroesHook.java +++ b/src/main/java/net/Indyuce/mmoitems/comp/rpg/HeroesHook.java @@ -49,7 +49,7 @@ public class HeroesHook implements RPGHandler, Listener, AttackHandler { return null; Player player = (Player) info.getCharacter().getEntity(); - DamageMetadata damageMeta = new DamageMetadata(0, info.getSkill().getTypes().stream().filter(damages::containsKey).map(damages::get).distinct().toArray(DamageType[]::new)); + DamageMetadata damageMeta = new DamageMetadata(event.getDamage(), info.getSkill().getTypes().stream().filter(damages::containsKey).map(damages::get).toArray(DamageType[]::new)); return new AttackMetadata(damageMeta, MMOPlayerData.get(player).getStatMap().cache(EquipmentSlot.MAIN_HAND)); } diff --git a/src/main/java/net/Indyuce/mmoitems/stat/type/ItemStat.java b/src/main/java/net/Indyuce/mmoitems/stat/type/ItemStat.java index 52602092..676ac013 100644 --- a/src/main/java/net/Indyuce/mmoitems/stat/type/ItemStat.java +++ b/src/main/java/net/Indyuce/mmoitems/stat/type/ItemStat.java @@ -104,10 +104,12 @@ public abstract class ItemStat { public abstract void whenClicked(@NotNull EditionInventory inv, @NotNull InventoryClickEvent event); /** - * When inputing data using chat or anvil input in order to edit the item - * using the GUI editor. IAE are handled and exception messages are sent - * back to the player. Stat edition is not canceled until a right input is - * given or the player inputs 'cancel' + * When inputting data using player input in order to edit the item using + * the GUI editor. IAE's are handled and exception messages are sent back + * to the player. Stat edition is not canceled until a right input is given + * or the player inputs "cancel". + *

+ * This method is called async inside of an AsyncPlayerChatEvent * * @param inv Previously opened edition menu * @param message Player input