Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

No item skills cast when in casting mode

Browse Source
This commit is contained in:
Indyuce 2022-02-26 22:15:01 +01:00
parent 5ee8a8e219
commit 52c2a07e47
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/net/Indyuce/mmocore/skill/cast/listener/KeyCombos.java
View File

@ -2,9 +2,11 @@ package net.Indyuce.mmocore.skill.cast.listener;
import io.lumine.mythic.lib.MythicLib; import io.lumine.mythic.lib.MythicLib;
import io.lumine.mythic.lib.UtilityMethods; import io.lumine.mythic.lib.UtilityMethods;
import io.lumine.mythic.lib.api.event.skill.PlayerCastSkillEvent;
import io.lumine.mythic.lib.api.player.EquipmentSlot; import io.lumine.mythic.lib.api.player.EquipmentSlot;
import io.lumine.mythic.lib.player.PlayerMetadata; import io.lumine.mythic.lib.player.PlayerMetadata;
import io.lumine.mythic.lib.skill.trigger.TriggerMetadata; import io.lumine.mythic.lib.skill.trigger.TriggerMetadata;
import io.lumine.mythic.lib.skill.trigger.TriggerType;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.SoundObject; import net.Indyuce.mmocore.api.SoundObject;
import net.Indyuce.mmocore.api.event.PlayerKeyPressEvent; import net.Indyuce.mmocore.api.event.PlayerKeyPressEvent;
@ -19,9 +21,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.HashMap; import java.util.*;
import java.util.Map;
import java.util.Objects;
import java.util.logging.Level; import java.util.logging.Level;
public class KeyCombos implements Listener { public class KeyCombos implements Listener {
@ -144,6 +144,30 @@ public class KeyCombos implements Listener {
} }
} }
private static final Set<TriggerType> IGNORED_WHEN_CASTING = new HashSet<>();
static {
IGNORED_WHEN_CASTING.add(TriggerType.RIGHT_CLICK);
IGNORED_WHEN_CASTING.add(TriggerType.LEFT_CLICK);
IGNORED_WHEN_CASTING.add(TriggerType.SHIFT_RIGHT_CLICK);
IGNORED_WHEN_CASTING.add(TriggerType.SHIFT_LEFT_CLICK);
IGNORED_WHEN_CASTING.add(TriggerType.SNEAK);
}
/**
* This makes sure NO skills are cast when in casting mode so that
* item abilities from MMOItems don't interfere with that.
* <p>
* Any trigger type that has a PlayerKey associated to it will
* be ignored if the player is currently in casting mode.
*/
@EventHandler
public void ignoreOtherSkills(PlayerCastSkillEvent event) {
TriggerType triggerType = event.getCast().getTrigger();
if (IGNORED_WHEN_CASTING.contains(triggerType) && PlayerData.get(event.getData().getUniqueId()).isCasting())
event.setCancelled(true);
}
private class CustomSkillCastingHandler extends SkillCastingHandler { private class CustomSkillCastingHandler extends SkillCastingHandler {
private final KeyCombo current = new KeyCombo(); private final KeyCombo current = new KeyCombo();