Skip to content

Commit 4691624

Browse files
committed
Tweaks to active_dot and action.X.clash
1 parent 70d7c5b commit 4691624

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

State.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4976,6 +4976,9 @@ local mt_default_action = {
49764976
elseif k == "disabled" then
49774977
return state:IsDisabled( t.action )
49784978

4979+
elseif k == "clash" then
4980+
return state.settings.abilities[ t.action ].clash or 0
4981+
49794982
elseif k == "gcd" then
49804983
local queued_action = state.this_action
49814984
state.this_action = t.action

Targets.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -832,15 +832,15 @@ ns.Audit = function( special )
832832
for aura, targets in pairs( debuffs ) do
833833
local a = class.auras[ aura ]
834834
local window = a and a.duration or grace
835-
local expires = a and a.no_ticks or false
836-
local friendly = a and a.friendly or false
835+
local friendly = a and ( a.friendly or a.dot == "buff" ) or false
836+
local expires = not ( a and a.no_ticks or friendly )
837837

838838
for unit, entry in pairs( targets ) do
839839
-- NYI: Check for dot vs. debuff, since debuffs won't 'tick'
840840
if expires and now - entry.last_seen > window then
841841
ns.trackDebuff( aura, unit )
842842
elseif special == "combatExit" and not friendly then
843-
Hekili:Error( format( "Auditor removed an aura %d from %s after exiting combat.", aura, unit ) )
843+
-- Hekili:Error( format( "Auditor removed an aura %d from %s after exiting combat.", aura, unit ) )
844844
ns.trackDebuff( aura, unit )
845845
end
846846
end

0 commit comments

Comments
 (0)