Removing "no charges" requirement

tullamods · Jul 21, 2013 · da171dd · da171dd
1 parent eae9ca2
commit da171dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/core/cooldown.lua b/core/cooldown.lua
@@ -40,12 +40,10 @@ function Cooldown:Stop()
 end
 
 function Cooldown:CanShow(start, duration, charges)
-	if self.noCooldownCount or not (start and duration) or (charges or 0) ~= 0 then
-		return false
+	if not self.noCooldownCount and start and duration then
+		local sets = OmniCC:GetGroupSettingsFor(self) 
+		return start > 0 and duration >= sets.minDuration and sets.enabled
 	end
-	
-	local sets = OmniCC:GetGroupSettingsFor(self) 
-	return start > 0 and duration >= sets.minDuration and sets.enabled
 end
 
 

diff --git a/core/timer.lua b/core/timer.lua
@@ -44,7 +44,7 @@ end
 --[[ Controls ]]--
 
 function Timer:Start(start, duration, charges)
-	self.start, self.duration, self.charges = start, duration, charges
+	self.start, self.duration, self.charges = start, duration, charges or 0
 	self.visible = self.cooldown:IsVisible()
 	self.finish = start + duration
 	self.textStyle = nil