diff --git a/src/de/steamwar/lobby/listener/InventoryInteraction.java b/src/de/steamwar/lobby/listener/InventoryInteraction.java index ac41aba..073df1a 100644 --- a/src/de/steamwar/lobby/listener/InventoryInteraction.java +++ b/src/de/steamwar/lobby/listener/InventoryInteraction.java @@ -23,31 +23,28 @@ import de.steamwar.lobby.command.ModifyCommand; import org.bukkit.Material; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; -import org.bukkit.event.block.Action; import org.bukkit.event.inventory.InventoryClickEvent; -import org.bukkit.event.player.PlayerDropItemEvent; -import org.bukkit.event.player.PlayerInteractEvent; -import org.bukkit.event.player.PlayerPickupItemEvent; -import org.bukkit.event.player.PlayerSwapHandItemsEvent; +import org.bukkit.event.player.*; import org.bukkit.inventory.ItemStack; public class InventoryInteraction extends BasicListener { - @EventHandler(priority = EventPriority.LOW) + @EventHandler public void handlePlayerInteract(PlayerInteractEvent event) { - ItemStack item = event.getItem(); - if(item == null) + if(event.getItem() == null) return; - if ((event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK) && item.getType() == Material.FIREWORK_ROCKET) { - item.setAmount(2); - return; - } - if(!ModifyCommand.modifying(event.getPlayer())) event.setCancelled(true); } + @EventHandler + public void handleItemConsume(PlayerItemConsumeEvent event) { + ItemStack item = event.getItem(); + if (item.getType() == Material.FIREWORK_ROCKET) + item.setAmount(2); + } + @EventHandler public void handlePlayerDropItem(PlayerDropItemEvent event) { event.setCancelled(true);