diff --git a/MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/mythicmobs/MythicMobsCompatibility.java b/MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/mythicmobs/MythicMobsCompatibility.java index 7527b491..915fa75e 100644 --- a/MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/mythicmobs/MythicMobsCompatibility.java +++ b/MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/mythicmobs/MythicMobsCompatibility.java @@ -7,7 +7,7 @@ import io.lumine.mythic.bukkit.events.MythicReloadedEvent; import net.Indyuce.mmoitems.MMOItems; import net.Indyuce.mmoitems.api.player.PlayerData; import net.Indyuce.mmoitems.comp.mythicmobs.mechanics.MMOItemsArrowVolleyMechanic; -import net.Indyuce.mmoitems.comp.mythicmobs.mechanics.MMOItemsOnShootAura; +import net.Indyuce.mmoitems.comp.mythicmobs.mechanics.MMOItemsOnUseAura; import net.Indyuce.mmoitems.comp.mythicmobs.stat.FactionDamage; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -34,17 +34,22 @@ public class MythicMobsCompatibility implements Listener { Bukkit.getPluginManager().registerEvents(this, MMOItems.plugin); } - @EventHandler(priority = EventPriority.HIGH) public void b(MythicMechanicLoadEvent event) { // Switch Mechanic ig switch (event.getMechanicName().toLowerCase()) { case "mmoitemsvolley": - event.register(new MMOItemsArrowVolleyMechanic(event.getContainer().getManager(), event.getContainer().getFile(), event.getContainer().getConfigLine(), event.getConfig())); + event.register(new MMOItemsArrowVolleyMechanic(event.getContainer().getManager(), + event.getContainer().getFile(), + event.getConfig().getLine(), + event.getConfig())); break; case "onmmoitemuse": - event.register(new MMOItemsOnShootAura(event.getContainer().getManager(), event.getContainer().getFile(), event.getContainer().getConfigLine(), event.getConfig())); + event.register(new MMOItemsOnUseAura(event.getContainer().getManager(), + event.getContainer().getFile(), + event.getConfig().getLine(), + event.getConfig())); break; default: break; diff --git a/MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/mythicmobs/mechanics/MMOItemsOnShootAura.java b/MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/mythicmobs/mechanics/MMOItemsOnUseAura.java similarity index 95% rename from MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/mythicmobs/mechanics/MMOItemsOnShootAura.java rename to MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/mythicmobs/mechanics/MMOItemsOnUseAura.java index 797c3e45..465393e3 100644 --- a/MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/mythicmobs/mechanics/MMOItemsOnShootAura.java +++ b/MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/mythicmobs/mechanics/MMOItemsOnUseAura.java @@ -31,7 +31,7 @@ import java.util.Optional; * * @author Gunging */ -public class MMOItemsOnShootAura extends Aura implements ITargetedEntitySkill { +public class MMOItemsOnUseAura extends Aura implements ITargetedEntitySkill { @NotNull PlaceholderString skillName; @NotNull @@ -44,7 +44,7 @@ public class MMOItemsOnShootAura extends Aura implements ITargetedEntitySkill { @NotNull final ArrayList auraWeapons = new ArrayList<>(); - public MMOItemsOnShootAura(SkillExecutor manager, File file, String line, MythicLineConfig mlc) { + public MMOItemsOnUseAura(SkillExecutor manager, File file, String line, MythicLineConfig mlc) { super(manager, file, line, mlc); skillName = mlc.getPlaceholderString(new String[]{"skill", "s", "ondamagedskill", "ondamaged", "od", "onhitskill", "onhit", "oh", "meta", "m", "mechanics", "$", "()"}, "skill not found"); @@ -109,7 +109,7 @@ public class MMOItemsOnShootAura extends Aura implements ITargetedEntitySkill { caster = new GenericCaster(target); } - new MMOItemsOnShootAura.Tracker(caster, data, target); + new MMOItemsOnUseAura.Tracker(caster, data, target); return SkillResult.SUCCESS; } @@ -169,7 +169,7 @@ public class MMOItemsOnShootAura extends Aura implements ITargetedEntitySkill { } })); - this.executeAuraSkill(MMOItemsOnShootAura.this.onStartSkill, this.skillMetadata); + this.executeAuraSkill(MMOItemsOnUseAura.this.onStartSkill, this.skillMetadata); } }