Skip to content

Commit

Permalink
Right-click to use a skill
Browse files Browse the repository at this point in the history
  • Loading branch information
NathanWolf committed Jan 3, 2018
1 parent 9577433 commit 131c327
Showing 2 changed files with 19 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
# 1.7

- Fix unprepare lore duplicating when spamming left-click+right-click on an item
- Right-clicking while holding a skill item will use it

# 1.6

18 changes: 18 additions & 0 deletions src/main/java/com/elmakers/mine/bukkit/heroes/PlayerListener.java
Original file line number Diff line number Diff line change
@@ -5,9 +5,11 @@
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.entity.ItemSpawnEvent;
import org.bukkit.event.player.PlayerDropItemEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerItemHeldEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.inventory.ItemStack;
@@ -64,6 +66,22 @@ public void onPlayerEquip(PlayerItemHeldEvent event) {
}
}

@EventHandler
public void onPlayerInteract(PlayerInteractEvent event)
{
if (event.getAction() != Action.RIGHT_CLICK_AIR && event.getAction() != Action.RIGHT_CLICK_BLOCK) return;

Player player = event.getPlayer();
PlayerInventory inventory = player.getInventory();
ItemStack itemInHand = inventory.getItemInMainHand();

boolean isSkill = controller.isSkill(itemInHand);
if (isSkill) {
controller.useSkill(player, itemInHand);
event.setCancelled(true);
}
}

@EventHandler
public void onBlockPlace(BlockPlaceEvent event)
{

0 comments on commit 131c327

Please sign in to comment.