forked from Upstream/mmocore
Solved cancel inventory click event bug & Key Combos bug
This commit is contained in:
parent
ca26701c43
commit
7b54c9041d
@ -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);
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user