Merge branch 'update' of https://github.com/NoM0Re/WeakAuras-WotLK into update
This commit is contained in:
@@ -308,9 +308,9 @@ function lib.GetUnitNameplate(unit)
|
||||
local nameplate = C_NamePlate.GetNamePlateForUnit(unit)
|
||||
if nameplate then
|
||||
-- credit to Exality for https://wago.io/explosiveorbs
|
||||
if nameplate.unitFrame and nameplate.unitFrame.Health then
|
||||
if nameplate.UnitFrame and nameplate.UnitFrame.Health then
|
||||
-- elvui
|
||||
return nameplate.unitFrame.Health
|
||||
return nameplate.UnitFrame.Health
|
||||
elseif nameplate.unitFramePlater and nameplate.unitFramePlater.healthBar then
|
||||
-- plater
|
||||
return nameplate.unitFramePlater.healthBar
|
||||
|
||||
@@ -2447,6 +2447,7 @@ local function removeNameplateUnits(data)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local oldDataStub = {
|
||||
@@ -2652,7 +2653,7 @@ function WeakAuras.PreAdd(data, snapshot)
|
||||
end
|
||||
validateUserConfig(data, data.authorOptions, data.config)
|
||||
if not(WeakAuras.isAwesomeEnabled()) then
|
||||
removeNameplateUnits(data)
|
||||
removeNameplateUnitsAndAnchors(data)
|
||||
end
|
||||
data.init_started = nil
|
||||
data.init_completed = nil
|
||||
|
||||
Reference in New Issue
Block a user