Merge branch 'master' of https://github.com/Shestak/ShestakUI

Shestak · Sep 15, 2013 · 501c79d · 501c79d
2 parents 50de0e1 + c4c9699
commit 501c79d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/ShestakUI/Config/Filters/CombatText.lua b/ShestakUI/Config/Filters/CombatText.lua
@@ -14,6 +14,10 @@ end
 -- General merge outgoing damage
 if C.combattext.merge_aoe_spam then
 	T.aoespam = {}
+	T.aoespam[148008] = true		-- Essence of Yu'lon
+	T.aoespam[148009] = true		-- Spirit of Chi-Ji
+	T.aoespam[149276] = true		-- Flurry of Xuen
+	T.aoespam[147891] = true		-- Flurry of Xuen
 	T.aoespam[120687] = true		-- Stormlash
 end
 

diff --git a/ShestakUI/Modules/Cooldowns/PulseCD.lua b/ShestakUI/Modules/Cooldowns/PulseCD.lua
@@ -133,9 +133,9 @@ function frame:ADDON_LOADED(addon)
 end
 frame:RegisterEvent("ADDON_LOADED")
 
-function frame:UNIT_SPELLCAST_SUCCEEDED(unit, spell)
+function frame:UNIT_SPELLCAST_SUCCEEDED(unit, spell, _, _, spellID)
 	if unit == "player" then
-		watching[spell] = {GetTime(), "spell", spell}
+		watching[spell] = {GetTime(), "spell", spellID}
 		self:SetScript("OnUpdate", OnUpdate)
 	end
 end
@@ -150,7 +150,7 @@ function frame:COMBAT_LOG_EVENT_UNFILTERED(...)
 			if index and not select(7, GetPetActionInfo(index)) then
 				watching[name] = {GetTime(), "pet", index}
 			elseif not index and name then
-				watching[name] = {GetTime(), "spell", name}
+				watching[name] = {GetTime(), "spell", spellID}
 			else
 				return
 			end

diff --git a/ShestakUI/Modules/Tooltip/Tooltip.lua b/ShestakUI/Modules/Tooltip/Tooltip.lua
@@ -506,4 +506,4 @@ local function FixFont(self)
 end
 
 GameTooltip:HookScript("OnTooltipSetItem", FixFont)
-ItemRefTooltip:HookScript("OnTooltipSetItem", FixFont)
+ItemRefTooltip:HookScript("OnTooltipSetItem", FixFont)