Upstream/mmocore
1
0
Fork 1
mirror of https://gitlab.com/phoenix-dvpmt/mmocore.git synced 2024-10-22 20:10:00 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Solved cancel inventory click event bug & Key Combos bug

Browse Source
This commit is contained in:
Ka0rX 2022-10-02 09:55:50 +02:00
parent ca26701c43
commit 7b54c9041d
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,9 +101,6 @@ public class KeyCombos implements Listener {
if (initializerKey != null) {
if (event.getPressed() == initializerKey) {
// Always cancel event
event.setCancelled(true);
// Start combo
playerData.setSkillCasting(new CustomSkillCastingHandler(playerData));
if (beginComboSound != null)
@ -114,8 +111,9 @@ public class KeyCombos implements Listener {
Set<PlayerKey> firstKeys = playerData.getProfess().getFirstComboKeys().isEmpty() ? firstComboKeys : playerData.getProfess().getFirstComboKeys();
if (firstKeys.contains(event.getPressed())) {
// Always cancel event
event.setCancelled(true);
// Always cancel drop event
if (event.getPressed().equals(PlayerKey.DROP))
event.setCancelled(true);
// Start combo
CustomSkillCastingHandler casting = new CustomSkillCastingHandler(playerData);

9
MMOCore-Dist/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java
View File

@ -38,9 +38,12 @@ public class PlayerListener implements Listener {
// Register custom inventory clicks
@EventHandler
public void b(InventoryClickEvent event) {
if (event.getInventory().getHolder() instanceof PluginInventory && event.getCurrentItem() != null && event.getCurrentItem().getItemMeta() != null)
((PluginInventory) event.getInventory().getHolder())
.whenClicked(new InventoryClickContext(event.getRawSlot(), event.getCurrentItem(), event.getClick(), event,event.getInventory()));
if (event.getInventory().getHolder() instanceof PluginInventory) {
event.setCancelled(true);
if (event.getCurrentItem() != null && event.getCurrentItem().getItemMeta() != null)
((PluginInventory) event.getInventory().getHolder())
.whenClicked(new InventoryClickContext(event.getRawSlot(), event.getCurrentItem(), event.getClick(), event, event.getInventory()));
}
}
// Register custom inventory close effect