diff --git a/src/com/projectkorra/ProjectKorra/ConfigManager.java b/src/com/projectkorra/ProjectKorra/ConfigManager.java index 54bec172..c66e1ee1 100644 --- a/src/com/projectkorra/ProjectKorra/ConfigManager.java +++ b/src/com/projectkorra/ProjectKorra/ConfigManager.java @@ -175,6 +175,7 @@ public class ConfigManager { config.addDefault("Abilities.Air.AirSwipe.Push", 1); config.addDefault("Abilities.Air.AirSwipe.Arc", 20); config.addDefault("Abilities.Air.AirSwipe.Speed", 25); + config.addDefault("Abilities.Air.AirSwipe.Cooldown", 1500); config.addDefault("Abilities.Air.Tornado.Radius", 10); config.addDefault("Abilities.Air.Tornado.Height", 25); diff --git a/src/com/projectkorra/ProjectKorra/airbending/AirSwipe.java b/src/com/projectkorra/ProjectKorra/airbending/AirSwipe.java index e11f770d..29377e76 100644 --- a/src/com/projectkorra/ProjectKorra/airbending/AirSwipe.java +++ b/src/com/projectkorra/ProjectKorra/airbending/AirSwipe.java @@ -74,7 +74,7 @@ public class AirSwipe { // } // } if (cooldowns.containsKey(player.getName())) { - if (cooldowns.get(player.getName()) + config.getLong("Properties.GlobalCooldown") >= System.currentTimeMillis()) { + if (cooldowns.get(player.getName()) + config.getLong("Abilities.Air.AirSwipe.GlobalCooldown") >= System.currentTimeMillis()) { return; } else { cooldowns.remove(player.getName()); diff --git a/src/config.yml b/src/config.yml index bed886f2..a4b32381 100644 --- a/src/config.yml +++ b/src/config.yml @@ -127,6 +127,7 @@ Abilities: Push: 1 Arc: 20 Speed: 25 + Cooldown: 1500 Tornado: Enabled: true Description: "To use, simply sneak (default: shift). This will create a swirling vortex at the targeted location. Any creature or object caught in the vortex will be launched up and out in some random direction. If another player gets caught in the vortex, the launching effect is minimal. Tornado can also be used to transport the user. If the user gets caught in his/her own tornado, his/her movements are much more manageable. Provided the user doesn't fall out of the vortex, it will take him to a maximum height and move him in the general direction he/she is looking. Skilled airbenders can scale anything with this ability."