From 8ee81c9c0e3194fb841bd25b22ad175bf8179337 Mon Sep 17 00:00:00 2001
From: BuildTools <unconfigured@null.spigotmc.org>
Date: Sun, 1 May 2016 07:03:35 +0100
Subject: [PATCH] Fix catapult cooldown and adds cobblestone to default
 earthblocks list

---
 .../projectkorra/projectkorra/configuration/ConfigManager.java  | 2 ++
 src/com/projectkorra/projectkorra/earthbending/Catapult.java    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java
index fd54d99e..04b76689 100644
--- a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java
+++ b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java
@@ -340,6 +340,7 @@ public class ConfigManager {
 			earthBlocks.add("DIAMOND_ORE");
 			earthBlocks.add("NETHERRACK");
 			earthBlocks.add("QUARTZ_ORE");
+			earthBlocks.add("COBBLESTONE");
 
 			ArrayList<String> metalBlocks = new ArrayList<String>();
 			metalBlocks.add("IRON_BLOCK");
@@ -793,6 +794,7 @@ public class ConfigManager {
 			config.addDefault("Abilities.Earth.Catapult.Length", 6);
 			config.addDefault("Abilities.Earth.Catapult.Push", 4);
 			config.addDefault("Abilities.Earth.Catapult.ShiftModifier", 2);
+			config.addDefault("Abilities.Earth.Catapult.Cooldown", 1500);
 
 			config.addDefault("Abilities.Earth.Collapse.Enabled", true);
 			config.addDefault("Abilities.Earth.Collapse.SelectRange", 20);
diff --git a/src/com/projectkorra/projectkorra/earthbending/Catapult.java b/src/com/projectkorra/projectkorra/earthbending/Catapult.java
index f04116e2..b6de9ed5 100644
--- a/src/com/projectkorra/projectkorra/earthbending/Catapult.java
+++ b/src/com/projectkorra/projectkorra/earthbending/Catapult.java
@@ -81,7 +81,7 @@ public class Catapult extends EarthAbility {
 		this.push = getConfig().getDouble("Abilities.Earth.Catapult.Push");
 		this.shiftModifier = getConfig().getDouble("Abilities.Earth.Catapult.ShiftModifier");
 		this.distance = 0;
-		this.cooldown = 0;
+		this.cooldown = getConfig().getLong("Abilities.Earth.Catapult.Cooldown");
 		this.catapult = false;
 		this.moving = false;
 		this.flying = false;