Merge pull request #207 from kingbirdy/fix/airspout

Fix airspout cancelling on right click
This commit is contained in:
MistPhizzle 2015-08-18 23:59:16 -04:00
commit 270c3060b0

View file

@ -854,9 +854,10 @@ 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) {
GeneralMethods.cooldowns.put(player.getName(), System.currentTimeMillis());
ComboManager.addComboAbility(player, ClickType.RIGHT_CLICK);
String ability = GeneralMethods.getBoundAbility(player); String ability = GeneralMethods.getBoundAbility(player);
if (!ability.equalsIgnoreCase("airspout")) //prevents airspout from cancelling due to right click
GeneralMethods.cooldowns.put(player.getName(), System.currentTimeMillis());
ComboManager.addComboAbility(player, ClickType.RIGHT_CLICK);
if (ability != null && ability.equalsIgnoreCase("EarthSmash")) if (ability != null && ability.equalsIgnoreCase("EarthSmash"))
new EarthSmash(player, ClickType.RIGHT_CLICK); new EarthSmash(player, ClickType.RIGHT_CLICK);
} }