From 68b7116bc4921c700f030dc2db3ca570e3296ef9 Mon Sep 17 00:00:00 2001 From: jedk1 Date: Tue, 2 Feb 2016 23:59:16 +0000 Subject: [PATCH] Fix all chi abilities not respecting cooldowns --- .../projectkorra/projectkorra/chiblocking/AcrobatStance.java | 3 +++ src/com/projectkorra/projectkorra/chiblocking/HighJump.java | 3 +++ src/com/projectkorra/projectkorra/chiblocking/Paralyze.java | 3 +++ src/com/projectkorra/projectkorra/chiblocking/QuickStrike.java | 3 +++ src/com/projectkorra/projectkorra/chiblocking/RapidPunch.java | 3 +++ src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java | 3 +++ .../projectkorra/projectkorra/chiblocking/WarriorStance.java | 3 +++ 7 files changed, 21 insertions(+) diff --git a/src/com/projectkorra/projectkorra/chiblocking/AcrobatStance.java b/src/com/projectkorra/projectkorra/chiblocking/AcrobatStance.java index 6731c269..9df30db0 100644 --- a/src/com/projectkorra/projectkorra/chiblocking/AcrobatStance.java +++ b/src/com/projectkorra/projectkorra/chiblocking/AcrobatStance.java @@ -16,6 +16,9 @@ public class AcrobatStance extends ChiAbility { public AcrobatStance(Player player) { super(player); + if (!bPlayer.canBend(this)) { + return; + } this.speed = getConfig().getInt("Abilities.Chi.AcrobatStance.Speed"); this.jump = getConfig().getInt("Abilities.Chi.AcrobatStance.Jump"); diff --git a/src/com/projectkorra/projectkorra/chiblocking/HighJump.java b/src/com/projectkorra/projectkorra/chiblocking/HighJump.java index 33d83b56..90a1c174 100644 --- a/src/com/projectkorra/projectkorra/chiblocking/HighJump.java +++ b/src/com/projectkorra/projectkorra/chiblocking/HighJump.java @@ -17,6 +17,9 @@ public class HighJump extends ChiAbility { public HighJump(Player player) { super(player); + if (!bPlayer.canBend(this)) { + return; + } this.height = ProjectKorra.plugin.getConfig().getInt("Abilities.Chi.HighJump.Height"); this.cooldown = ProjectKorra.plugin.getConfig().getInt("Abilities.Chi.HighJump.Cooldown"); start(); diff --git a/src/com/projectkorra/projectkorra/chiblocking/Paralyze.java b/src/com/projectkorra/projectkorra/chiblocking/Paralyze.java index 894167c0..a4f9dce1 100644 --- a/src/com/projectkorra/projectkorra/chiblocking/Paralyze.java +++ b/src/com/projectkorra/projectkorra/chiblocking/Paralyze.java @@ -22,6 +22,9 @@ public class Paralyze extends ChiAbility { public Paralyze(Player sourceplayer, Entity targetentity) { super(sourceplayer); + if (!bPlayer.canBend(this)) { + return; + } this.target = targetentity; this.cooldown = getConfig().getLong("Abilities.Chi.Paralyze.Cooldown"); start(); diff --git a/src/com/projectkorra/projectkorra/chiblocking/QuickStrike.java b/src/com/projectkorra/projectkorra/chiblocking/QuickStrike.java index a2aa4fb9..b6029f47 100644 --- a/src/com/projectkorra/projectkorra/chiblocking/QuickStrike.java +++ b/src/com/projectkorra/projectkorra/chiblocking/QuickStrike.java @@ -15,6 +15,9 @@ public class QuickStrike extends ChiAbility { public QuickStrike(Player player) { super(player); + if (!bPlayer.canBend(this)) { + return; + } this.damage = getConfig().getInt("Abilities.Chi.QuickStrike.Damage"); this.blockChance = getConfig().getInt("Abilities.Chi.QuickStrike.ChiBlockChance"); target = GeneralMethods.getTargetedEntity(player, 2); diff --git a/src/com/projectkorra/projectkorra/chiblocking/RapidPunch.java b/src/com/projectkorra/projectkorra/chiblocking/RapidPunch.java index f7356d7d..37a5ebf5 100644 --- a/src/com/projectkorra/projectkorra/chiblocking/RapidPunch.java +++ b/src/com/projectkorra/projectkorra/chiblocking/RapidPunch.java @@ -20,6 +20,9 @@ public class RapidPunch extends ChiAbility { public RapidPunch(Player player) { super(player); + if (!bPlayer.canBend(this)) { + return; + } this.damage = getConfig().getInt("Abilities.Chi.RapidPunch.Damage"); this.punches = getConfig().getInt("Abilities.Chi.RapidPunch.Punches"); this.distance = getConfig().getInt("Abilities.Chi.RapidPunch.Distance"); diff --git a/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java b/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java index 30161ba6..bcda67e0 100644 --- a/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java +++ b/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java @@ -16,6 +16,9 @@ public class SwiftKick extends ChiAbility { public SwiftKick(Player player) { super(player); + if (!bPlayer.canBend(this)) { + return; + } this.damage = getConfig().getInt("Abilities.Chi.SwiftKick.Damage"); this.blockChance = getConfig().getInt("Abilities.Chi.ChiCombo.ChiBlockChance"); this.cooldown = getConfig().getInt("Abilities.Chi.ChiCombo.Cooldown"); diff --git a/src/com/projectkorra/projectkorra/chiblocking/WarriorStance.java b/src/com/projectkorra/projectkorra/chiblocking/WarriorStance.java index 70e994ae..828a31f0 100644 --- a/src/com/projectkorra/projectkorra/chiblocking/WarriorStance.java +++ b/src/com/projectkorra/projectkorra/chiblocking/WarriorStance.java @@ -14,6 +14,9 @@ public class WarriorStance extends ChiAbility { public WarriorStance(Player player) { super(player); + if (!bPlayer.canBend(this)) { + return; + } this.strength = getConfig().getInt("Abilities.Chi.WarriorStance.Strength"); this.resistance = getConfig().getInt("Abilities.Chi.WarriorStance.Resistance");