From 7b54c9041d0821315112b203a459de3090f6c93f Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Sun, 2 Oct 2022 09:55:50 +0200 Subject: [PATCH] Solved cancel inventory click event bug & Key Combos bug --- .../Indyuce/mmocore/skill/cast/listener/KeyCombos.java | 8 +++----- .../net/Indyuce/mmocore/listener/PlayerListener.java | 9 ++++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/cast/listener/KeyCombos.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/cast/listener/KeyCombos.java index 10d26842..e3160a83 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/cast/listener/KeyCombos.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/cast/listener/KeyCombos.java @@ -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 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); diff --git a/MMOCore-Dist/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java b/MMOCore-Dist/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java index fc433272..c3f53116 100644 --- a/MMOCore-Dist/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java +++ b/MMOCore-Dist/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java @@ -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