From 66a27dcb10c1f67e8b96e88efd5f4fbd78897133 Mon Sep 17 00:00:00 2001 From: Aria Date: Mon, 25 Nov 2019 15:53:46 +0100 Subject: [PATCH] Small fixes Fixed consumables being placed when on cooldown Consumable cooldowns now show in the actionbar --- src/main/java/net/Indyuce/mmoitems/listener/ItemUse.java | 3 ++- src/main/resources/config.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/Indyuce/mmoitems/listener/ItemUse.java b/src/main/java/net/Indyuce/mmoitems/listener/ItemUse.java index ba60159d..c4e2e285 100644 --- a/src/main/java/net/Indyuce/mmoitems/listener/ItemUse.java +++ b/src/main/java/net/Indyuce/mmoitems/listener/ItemUse.java @@ -80,7 +80,8 @@ public class ItemUse implements Listener { // commands & consummables if (event.getAction().name().contains("RIGHT_CLICK")) { if (!useItem.getPlayerData().canUseItem(useItem.getMMOItem().getId())) { - Message.ITEM_ON_COOLDOWN.format(ChatColor.RED, "#left#", digit.format(useItem.getPlayerData().getItemCooldown(useItem.getMMOItem().getId()))).send(player); + Message.ITEM_ON_COOLDOWN.format(ChatColor.RED, "#left#", digit.format(useItem.getPlayerData().getItemCooldown(useItem.getMMOItem().getId()))).send(player, "item-cooldown"); + event.setCancelled(true); return; } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 923ed72c..7fbe8c3b 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -178,6 +178,7 @@ ability-player-damage: true # Might interfere with other action bar plugins. action-bar-display: ability-cooldown: true + item-cooldown: true not-enough-mana: true not-enough-stamina: true two-handed: true