diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemUsable.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemUsable.java index 5236e9a50..c89a87820 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemUsable.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemUsable.java @@ -67,7 +67,7 @@ public abstract class ItemUsable extends Item implements IThrown @EventHandler public void Use(PlayerInteractEvent event) - { + { if (_useAction == null) return; @@ -76,7 +76,7 @@ public abstract class ItemUsable extends Item implements IThrown if (!UtilGear.isMat(player.getItemInHand(), GetType())) return; - if (!UtilItem.getDisplayName(player.getItemInHand()).equals(_itemName) && !UtilServer.getPlugin().getName().equals("Clans")) + if ((UtilItem.getDisplayName(player.getItemInHand()) == null || !UtilItem.getDisplayName(player.getItemInHand()).equals(_itemName)) && !UtilServer.getPlugin().getName().equals("Clans")) return; if (!UtilEvent.isAction(event, _useAction))