Skip to content
Open

fix #6014

Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions WeakAuras/BuffTrigger2.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4238,11 +4238,35 @@ do
end
end

CheckAurasMulti = function(base, unit, filter)
CheckAurasMulti = function(base, unit, filter, unitAuraUpdateInfo)
if newAPI then
_base = base
_unit = unit
AuraUtil.ForEachAura(unit, filter, nil, HandleAura, true)
if unitAuraUpdateInfo then
-- incremental
if unitAuraUpdateInfo.addedAuras ~= nil then
for _, aura in ipairs(unitAuraUpdateInfo.addedAuras) do
if (aura.isHelpful and filter == "HELPFUL") or (aura.isHarmful and filter == "HARMFUL") then
HandleAura(aura)
end
end
end
if unitAuraUpdateInfo.updatedAuraInstanceIDs ~= nil then
for _, auraInstanceID in ipairs(unitAuraUpdateInfo.updatedAuraInstanceIDs) do
local aura = C_UnitAuras.GetAuraDataByAuraInstanceID(unit, auraInstanceID)
if aura and ((aura.isHelpful and filter == "HELPFUL") or (aura.isHarmful and filter == "HARMFUL")) then
HandleAura(aura)
end
end
end
if unitAuraUpdateInfo.removedAuraInstanceIDs ~= nil then
for _, auraInstanceID in ipairs(unitAuraUpdateInfo.removedAuraInstanceIDs) do
-- TODO
end
end
else
AuraUtil.ForEachAura(unit, filter, nil, HandleAura, true)
end
else
local index = 1
while true do
Expand Down Expand Up @@ -4328,11 +4352,11 @@ function BuffTrigger.HandleMultiEvent(frame, event, ...)
unit = unit.."target"
ReleaseUID(unit)
elseif event == "UNIT_AURA" then
local unit = ...
local unit, updateInfo = ...
local guid = UnitGUID(unit)
if matchDataMulti[guid] then
CheckAurasMulti(matchDataMulti[guid], unit, "HELPFUL")
CheckAurasMulti(matchDataMulti[guid], unit, "HARMFUL")
CheckAurasMulti(matchDataMulti[guid], unit, "HELPFUL", updateInfo)
CheckAurasMulti(matchDataMulti[guid], unit, "HARMFUL", updateInfo)
end
elseif event == "PLAYER_LEAVING_WORLD" then
-- Remove everything..
Expand Down