TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-12 03:59:06 +00:00
Code Issues Projects Releases Wiki Activity

Fix bending activating on block right click

Browse source
This commit is contained in:
jedk1 2015-11-25 01:10:38 +00:00
parent 896d3a0e23
commit 3a151eb2d5
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/com/projectkorra/projectkorra/PKListener.java
View file

@ -5,6 +5,7 @@ import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.UUID;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -157,6 +158,7 @@ public class PKListener implements Listener {
ProjectKorra plugin; ProjectKorra plugin;
public static HashMap<Player, String> bendingDeathPlayer = new HashMap<Player, String>(); // Player killed by Bending public static HashMap<Player, String> bendingDeathPlayer = new HashMap<Player, String>(); // Player killed by Bending
public static List<UUID> interact = new ArrayList<UUID>(); // Player right click block
public PKListener(ProjectKorra plugin) { public PKListener(ProjectKorra plugin) {
this.plugin = plugin; this.plugin = plugin;
@ -966,6 +968,15 @@ public class PKListener implements Listener {
Player player = event.getPlayer(); Player player = event.getPlayer();
if (event.getAction() == Action.RIGHT_CLICK_BLOCK) { if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
final UUID uuid = player.getUniqueId();
interact.add(uuid);
new BukkitRunnable() {
public void run() {
interact.remove(uuid);
}
}.runTaskLater(plugin, 5);
String ability = GeneralMethods.getBoundAbility(player); String ability = GeneralMethods.getBoundAbility(player);
ComboManager.addComboAbility(player, ClickType.RIGHT_CLICK); ComboManager.addComboAbility(player, ClickType.RIGHT_CLICK);
if (ability != null && ability.equalsIgnoreCase("EarthSmash")) if (ability != null && ability.equalsIgnoreCase("EarthSmash"))
@ -1290,6 +1301,9 @@ public class PKListener implements Listener {
return; return;
Player player = event.getPlayer(); Player player = event.getPlayer();
if (interact.contains(player.getUniqueId())) return;
ComboManager.addComboAbility(player, ClickType.LEFT_CLICK); ComboManager.addComboAbility(player, ClickType.LEFT_CLICK);
if (Suffocate.isBreathbent(player)) { if (Suffocate.isBreathbent(player)) {