From 71792748c4b18c083b68a5f8158be2b82b5de0c0 Mon Sep 17 00:00:00 2001 From: Bunny67 Date: Wed, 30 Dec 2020 21:41:03 +0300 Subject: [PATCH] from retail --- WeakAuras/AuraEnvironment.lua | 3 +++ WeakAuras/GenericTrigger.lua | 7 +++++-- WeakAuras/Init.lua | 2 +- WeakAuras/WeakAuras.toc | 2 +- WeakAurasOptions/WeakAurasOptions.toc | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/WeakAuras/AuraEnvironment.lua b/WeakAuras/AuraEnvironment.lua index 2f35e03..9830794 100644 --- a/WeakAuras/AuraEnvironment.lua +++ b/WeakAuras/AuraEnvironment.lua @@ -148,6 +148,9 @@ local blockedFunctions = { local blockedTables = { SlashCmdList = true, + SendMailMailButton = true, + SendMailMoneyGold = true, + MailFrameTab2 = true, } local aura_environments = {} diff --git a/WeakAuras/GenericTrigger.lua b/WeakAuras/GenericTrigger.lua index cba8efa..b335fa6 100644 --- a/WeakAuras/GenericTrigger.lua +++ b/WeakAuras/GenericTrigger.lua @@ -3399,10 +3399,13 @@ function GenericTrigger.SetToolTip(trigger, state) GameTooltip:SetHyperlink("item:"..state.itemId..":0:0:0:0:0:0:0"); return true elseif (state.unit and state.unitBuffIndex) then - GameTooltip:SetUnitBuff(state.unit, state.unitBuffIndex); + GameTooltip:SetUnitBuff(state.unit, state.unitBuffIndex, state.unitBuffFilter); return true elseif (state.unit and state.unitDebuffIndex) then - GameTooltip:SetUnitDebuff(state.unit, state.unitDebuffIndex); + GameTooltip:SetUnitDebuff(state.unit, state.unitDebuffIndex, state.unitDebuffFilter); + return true + elseif (state.unit and state.unitAuraIndex) then + GameTooltip:SetUnitAura(state.unit, state.unitAuraIndex, state.unitAuraFilter) return true end end diff --git a/WeakAuras/Init.lua b/WeakAuras/Init.lua index 9bf23bd..8c5511a 100644 --- a/WeakAuras/Init.lua +++ b/WeakAuras/Init.lua @@ -8,7 +8,7 @@ WeakAuras.halfWidth = WeakAuras.normalWidth / 2 WeakAuras.doubleWidth = WeakAuras.normalWidth * 2 local versionStringFromToc = GetAddOnMetadata("WeakAuras", "Version") -local versionString = "3.1.4" +local versionString = "3.1.5" local buildTime = "20201210233053" WeakAuras.versionString = versionStringFromToc diff --git a/WeakAuras/WeakAuras.toc b/WeakAuras/WeakAuras.toc index a4f577c..c34a541 100644 --- a/WeakAuras/WeakAuras.toc +++ b/WeakAuras/WeakAuras.toc @@ -1,7 +1,7 @@ ## Interface: 30300 ## Title: WeakAuras ## Author: The WeakAuras Team -## Version: 3.1.4 +## Version: 3.1.5 ## Notes: A powerful, comprehensive utility for displaying graphics and information based on buffs, debuffs, and other triggers. ## Notes-esES: Potente y completa aplicación que te permitirá mostrar por pantalla múltiples diseños, basados en beneficios, perjuicios y otros activadores. ## Notes-deDE: Ein leistungsfähiges, umfassendes Addon zur grafischen Darstellung von Informationen von Auren, Cooldowns, Timern und vielem mehr. diff --git a/WeakAurasOptions/WeakAurasOptions.toc b/WeakAurasOptions/WeakAurasOptions.toc index cc20415..2455789 100644 --- a/WeakAurasOptions/WeakAurasOptions.toc +++ b/WeakAurasOptions/WeakAurasOptions.toc @@ -1,7 +1,7 @@ ## Interface: 30300 ## Title: WeakAuras Options ## Author: The WeakAuras Team -## Version: 3.1.4 +## Version: 3.1.5 ## Notes: Options for WeakAuras ## Notes-esES: Opciones para WeakAuras ## Notes-deDE: Optionen für WeakAuras