Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests 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

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

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

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