Upstream/mmocore
1
0
Fork 1
mirror of https://gitlab.com/phoenix-dvpmt/mmocore.git synced 2025-11-18 06:24:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support for latest ML skill API

Browse Source
This commit is contained in:
Jules 2025-03-06 14:38:02 +01:00
parent 449c7d11c7
commit 703f1f9610
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/CastableSkill.java
View File

@ -6,11 +6,11 @@ import io.lumine.mythic.lib.player.cooldown.CooldownInfo;
import io.lumine.mythic.lib.skill.Skill;
import io.lumine.mythic.lib.skill.SkillMetadata;
import io.lumine.mythic.lib.skill.handler.SkillHandler;
import net.Indyuce.mmocore.MMOCore;
import io.lumine.mythic.lib.skill.trigger.TriggerType;
import net.Indyuce.mmocore.api.ConfigMessage;
import net.Indyuce.mmocore.api.event.PlayerResourceUpdateEvent;
import net.Indyuce.mmocore.api.player.PlayerActivity;
import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.event.PlayerResourceUpdateEvent;
import javax.inject.Provider;
@ -25,19 +25,20 @@ public class CastableSkill extends Skill {
@Deprecated
public CastableSkill(ClassSkill skill, int fixedLevel) {
super(skill.getSkill().getTrigger());
this.skill = skill;
this.skillLevel = () -> fixedLevel;
}
public CastableSkill(ClassSkill skill, PlayerData playerData) {
super(skill.getSkill().getTrigger());
this.skill = skill;
this.skillLevel = () -> playerData.getSkillLevel(skill.getSkill());
}
@Override
public TriggerType getTrigger() {
return skill.getSkill().getTrigger();
}
public ClassSkill getSkill() {
return skill;
}

2
MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/cast/handler/KeyCombos.java
View File

@ -205,7 +205,7 @@ public class KeyCombos extends SkillCastingHandler {
*/
@EventHandler
public void ignoreOtherSkills(PlayerCastSkillEvent event) {
if (event.getPlayer().equals(getCaster().getPlayer()) && IGNORED_WHEN_CASTING.contains(event.getCast().getTrigger()))
if (event.getPlayer().equals(getCaster().getPlayer()) && IGNORED_WHEN_CASTING.contains(event.getMetadata()))
event.setCancelled(true);
}
}