Clean up WeakAuras table and remove members that no one should touch
This commit is contained in:
@@ -1723,7 +1723,7 @@ local function RecheckActiveForUnitType(unitType, unit, unitsToRemoveScan)
|
||||
end
|
||||
|
||||
local Buff2Frame = CreateFrame("Frame")
|
||||
WeakAuras.frames["WeakAuras Buff2 Frame"] = Buff2Frame
|
||||
Private.frames["WeakAuras Buff2 Frame"] = Buff2Frame
|
||||
|
||||
local function EventHandler(frame, event, arg1, arg2, ...)
|
||||
|
||||
@@ -2340,7 +2340,7 @@ function BuffTrigger.Add(data)
|
||||
local remFunc
|
||||
if trigger.unit ~= "multi" and CanHaveMatchCheck(trigger) and trigger.useRem then
|
||||
local remFuncStr = Private.function_strings.count:format(trigger.remOperator or ">=", tonumber(trigger.rem) or 0)
|
||||
remFunc = WeakAuras.LoadFunction(remFuncStr)
|
||||
remFunc = Private.LoadFunction(remFuncStr)
|
||||
end
|
||||
|
||||
local names
|
||||
@@ -2370,14 +2370,14 @@ function BuffTrigger.Add(data)
|
||||
else
|
||||
group_countFuncStr = Private.function_strings.count:format(">", 0)
|
||||
end
|
||||
groupCountFunc = WeakAuras.LoadFunction(group_countFuncStr)
|
||||
groupCountFunc = Private.LoadFunction(group_countFuncStr)
|
||||
end
|
||||
|
||||
local matchCountFunc
|
||||
if HasMatchCount(trigger) and trigger.match_countOperator and trigger.match_count and tonumber(trigger.match_count) then
|
||||
local count = tonumber(trigger.match_count)
|
||||
local match_countFuncStr = Private.function_strings.count:format(trigger.match_countOperator, count)
|
||||
matchCountFunc = WeakAuras.LoadFunction(match_countFuncStr)
|
||||
matchCountFunc = Private.LoadFunction(match_countFuncStr)
|
||||
elseif IsGroupTrigger(trigger) then
|
||||
if trigger.showClones and not trigger.combinePerUnit then
|
||||
matchCountFunc = GreaterEqualOne
|
||||
@@ -2395,7 +2395,7 @@ function BuffTrigger.Add(data)
|
||||
and tonumber(trigger.matchPerUnit_count) and trigger.matchPerUnit_countOperator then
|
||||
local count = tonumber(trigger.matchPerUnit_count)
|
||||
local match_countFuncStr = Private.function_strings.count:format(trigger.matchPerUnit_countOperator, count)
|
||||
matchPerUnitCountFunc = WeakAuras.LoadFunction(match_countFuncStr)
|
||||
matchPerUnitCountFunc = Private.LoadFunction(match_countFuncStr)
|
||||
end
|
||||
|
||||
local groupTrigger = trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party"
|
||||
@@ -2407,7 +2407,7 @@ function BuffTrigger.Add(data)
|
||||
local effectiveIgnoreInvisible = groupTrigger and trigger.ignoreInvisible
|
||||
local effectiveHostility = trigger.unit == "nameplate" and trigger.useHostility and trigger.hostility
|
||||
local effectiveNameCheck = groupTrigger and trigger.useUnitName and trigger.unitName
|
||||
local effectiveNpcId = trigger.unit == "nameplate" and trigger.useNpcId and WeakAuras.ParseStringCheck(trigger.npcId)
|
||||
local effectiveNpcId = trigger.unit == "nameplate" and trigger.useNpcId and Private.ExecEnv.ParseStringCheck(trigger.npcId)
|
||||
|
||||
if trigger.unit == "multi" then
|
||||
BuffTrigger.InitMultiAura()
|
||||
@@ -2471,7 +2471,7 @@ function BuffTrigger.Add(data)
|
||||
matchPerUnitCountFunc = matchPerUnitCountFunc,
|
||||
useAffected = unit == "group" and trigger.useAffected,
|
||||
isMulti = trigger.unit == "multi",
|
||||
nameChecker = effectiveNameCheck and WeakAuras.ParseNameCheck(trigger.unitName),
|
||||
nameChecker = effectiveNameCheck and Private.ExecEnv.ParseNameCheck(trigger.unitName),
|
||||
includePets = trigger.use_includePets and trigger.includePets or nil,
|
||||
npcId = effectiveNpcId
|
||||
}
|
||||
@@ -3310,7 +3310,7 @@ function BuffTrigger.InitMultiAura()
|
||||
end
|
||||
multiAuraFrame:RegisterEvent("PLAYER_LEAVING_WORLD")
|
||||
multiAuraFrame:SetScript("OnEvent", BuffTrigger.HandleMultiEvent)
|
||||
WeakAuras.frames["Multi-target 2 Aura Trigger Handler"] = multiAuraFrame
|
||||
Private.frames["Multi-target 2 Aura Trigger Handler"] = multiAuraFrame
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user