Allow removal from cooldown handler

DevotedMC · Jan 4, 2018 · 9b5afd1 · 9b5afd1
1 parent 11d8e04
commit 9b5afd1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>vg.civcraft.mc.civmodcore</groupId>
 	<artifactId>CivModCore</artifactId>
-	<version>1.6.1</version>
+	<version>1.6.2</version>
 
 	<name>CivModCore</name>
 	<url>https://github.com/DevotedMC/CivModCore/</url>

diff --git a/src/main/java/vg/civcraft/mc/civmodcore/util/cooldowns/ICoolDownHandler.java b/src/main/java/vg/civcraft/mc/civmodcore/util/cooldowns/ICoolDownHandler.java
@@ -45,4 +45,11 @@ public interface ICoolDownHandler<E> {
 	 */
 	long getTotalCoolDown();
 
+	/**
+	 * Removed the cooldown for the given object
+	 * 
+	 * @param e 
+	 *            Object to check
+	 */
+	void removeCooldown(E e);
 }
diff --git a/src/main/java/vg/civcraft/mc/civmodcore/util/cooldowns/MilliSecCoolDownHandler.java b/src/main/java/vg/civcraft/mc/civmodcore/util/cooldowns/MilliSecCoolDownHandler.java
@@ -53,5 +53,10 @@ public long getRemainingCoolDown(E e) {
 	public long getTotalCoolDown() {
 		return cooldown;
 	}
+
+	@Override
+	public void removeCooldown(E e) {
+		cds.remove(e);
+	}
 
 }
diff --git a/src/main/java/vg/civcraft/mc/civmodcore/util/cooldowns/TickCoolDownHandler.java b/src/main/java/vg/civcraft/mc/civmodcore/util/cooldowns/TickCoolDownHandler.java
@@ -65,5 +65,10 @@ public long getRemainingCoolDown(E e) {
 	public long getTotalCoolDown() {
 		return cooldown;
 	}
+
+	@Override
+	public void removeCooldown(E e) {
+		cds.remove(e);
+	}
 
 }