Override UpdateCooldown to keep it from being called at erroneous times

Author: brittyazel

Objects/EXTRABTN.lua

@@ -57,9 +57,9 @@ function EXTRABTN:SetType()
 	self:RegisterEvent("ZONE_CHANGED", "OnEvent")
 	self:RegisterEvent("SPELLS_CHANGED", "OnEvent")
 	self:RegisterEvent("PLAYER_ENTERING_WORLD", "OnEvent")
-	--self:RegisterEvent("SPELL_UPDATE_COOLDOWN", "OnEvent")
-	--self:RegisterEvent("SPELL_UPDATE_CHARGES", "OnEvent")
-	--self:RegisterEvent("SPELL_UPDATE_USABLE", "OnEvent")
+	self:RegisterEvent("SPELL_UPDATE_COOLDOWN", "OnEvent")
+	self:RegisterEvent("SPELL_UPDATE_CHARGES", "OnEvent")
+	self:RegisterEvent("SPELL_UPDATE_USABLE", "OnEvent")
 
 	self:SetAttribute("type1", "action")
 
@@ -71,6 +71,8 @@ function EXTRABTN:SetType()
 	self:SetScript("OnLeave", GameTooltip_Hide)
 
 	self:SetSkinned()
+
+	test = self;
 end
 
 
@@ -109,7 +111,7 @@ function EXTRABTN:UpdateButton()
 	if self.spellID then
 		self:UpdateIcon()
 
-		self:SetSpellCooldown(self.spellID) --for some reason this doesn't work if you give it self.spellName. The cooldown will be nil
+		self:UpdateCooldown()
 
 		---extra button charges (some quests have ability charges)
 		self:UpdateSpellCount(self.spellID)
@@ -120,6 +122,13 @@ function EXTRABTN:UpdateButton()
 
 end
 
+---overwrite function in parent class BUTTON
+function EXTRABTN:UpdateCooldown()
+	if self.spellID then
+		self:SetSpellCooldown(self.spellID) --for some reason this doesn't work if you give it self.spellName. The cooldown will be nil
+	end
+end
+
 
 function EXTRABTN:SetObjectVisibility()
 

Objects/ZONEABILITYBTN.lua

@@ -101,7 +101,7 @@ function ZONEABILITYBTN:UpdateButton()
 			self:SetAttribute("macrotext1", "/cast " .. self.spellName .. "();")
 		end
 
-		self:SetSpellCooldown(self.spellName)
+		self:UpdateCooldown()
 
 		---zone ability button charges (I'm not sure if zone abilities have charges, but this is just in case)
 		self:UpdateSpellCount(self.spellName)
@@ -112,6 +112,12 @@ function ZONEABILITYBTN:UpdateButton()
 
 end
 
+---overwrite function in parent class BUTTON
+function ZONEABILITYBTN:UpdateCooldown()
+	if self.spellName then
+		self:SetSpellCooldown(self.spellName)
+	end
+end
 
 function ZONEABILITYBTN:SetObjectVisibility(show)