Fix extractionbutton and zone button sometimes not working

brittyazel · Jan 25, 2019 · b4f5c5b · b4f5c5b
1 parent 93bb2c5
commit b4f5c5b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Objects/EXTRABTN.lua b/Objects/EXTRABTN.lua
@@ -48,7 +48,9 @@ function EXTRABTN:SetType()
 	self:RegisterEvent("SPELL_UPDATE_CHARGES", "OnEvent")
 	self:RegisterUnitEvent("UNIT_AURA", "player")
 
-	self:SetAttribute("type", "action")
+	self:SetAttribute("type1", "action")
+	self:SetAttribute("useparent-unit", false)
+	self:SetAttribute("unit", ATTRIBUTE_NOOP)
 	--action content gets set in UpdateButton
 	self:UpdateButton()
 
@@ -101,7 +103,7 @@ function EXTRABTN:UpdateButton()
 		self:UpdateIcon()
 
 		if not InCombatLockdown() then
-			self:SetAttribute("action", self.actionID)
+			self:SetAttribute("action1", self.actionID)
 		end
 
 		self:SetSpellCooldown(self.spellID)

diff --git a/Objects/ZONEABILITYBTN.lua b/Objects/ZONEABILITYBTN.lua
@@ -47,7 +47,9 @@ function ZONEABILITYBTN:SetType()
 	self:RegisterEvent("SPELL_UPDATE_COOLDOWN", "OnEvent")
 	self:RegisterEvent("SPELL_UPDATE_CHARGES", "OnEvent")
 
-	self:SetAttribute("type", "macro")
+	self:SetAttribute("type1", "macro")
+	self:SetAttribute("useparent-unit", false)
+	self:SetAttribute("unit", ATTRIBUTE_NOOP)
 	--macro content gets set in UpdateButton
 	self:UpdateButton()
 
@@ -93,7 +95,7 @@ function ZONEABILITYBTN:UpdateButton()
 		self:UpdateIcon()
 
 		if (self.spellName and not InCombatLockdown()) then
-			self:SetAttribute("macrotext", "/cast " .. self.spellName .. "();")
+			self:SetAttribute("macrotext1", "/cast " .. self.spellName .. "();")
 		end
 
 		self:SetSpellCooldown(self.spellID)