From 4f56b40d84d0017bdfaa9c4d4ed3f583cc3a611e Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Sun, 6 Apr 2014 19:30:11 +0100
Subject: [PATCH] Changed cooldowns to correctly use a float

---
 .../objects/creature/CreatureObject.java      | 49 +++++++++----------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java
index c76f6309..e6f7512c 100644
--- a/src/resources/objects/creature/CreatureObject.java
+++ b/src/resources/objects/creature/CreatureObject.java
@@ -1728,43 +1728,40 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 		}
 	}
 	
-	public void addCooldown(String ability, long duration) {
-		if (cooldowns.containsKey(ability))
-			cooldowns.remove(ability);
+	public void addCooldown(String cooldownGroup, float duration) {
+		if (cooldowns.containsKey(cooldownGroup)) {
+			cooldowns.remove(cooldownGroup);
+		}
 		
-		Cooldown cd = new Cooldown(duration);
-		cd.setRemovalTask(Executors.newScheduledThreadPool(1).schedule(new Runnable() {
-
+		Cooldown cooldown = new Cooldown(duration);
+		
+		cooldown.setRemovalTask(Executors.newScheduledThreadPool(1).schedule(new Runnable() {
+			
 			@Override
 			public void run() {
-				removeCooldown(ability);
+				removeCooldown(cooldownGroup);
 			}
 			
 		}, duration, TimeUnit.MILLISECONDS));
-		cooldowns.put(ability, cd);
+		
+		cooldowns.put(cooldownGroup, cooldown);
 	}
 	
-	public boolean hasCooldown(String ability) {
-		if (cooldowns.containsKey(ability))
+	public boolean hasCooldown(String cooldownGroup) {
+		return cooldowns.containsKey(cooldownGroup);
+	}
+	
+	public boolean removeCooldown(String cooldownGroup) {
+		if (cooldowns.containsKey(cooldownGroup)) {
+			cooldowns.remove(cooldownGroup);
 			return true;
-		else
-			return false;
+		}
+		
+		return false;
 	}
 	
-	public boolean removeCooldown(String ability) {
-		if (cooldowns.containsKey(ability)) {
-			cooldowns.remove(ability);
-			return true;
-		} else {
-			return false;
-		}
+	public Cooldown getCooldown(String cooldownGroup) {
+		return cooldowns.get(cooldownGroup);
 	}
 	
-	public Cooldown getCooldown(String ability) {
-		if (cooldowns.containsKey(ability)) {
-			return cooldowns.get(ability);
-		} else {
-			return null;
-		}
-	}
 }