Commit b63f3214 authored by Simpy's avatar Simpy 🐹
Browse files

Merge branch 'development' into beta

# Conflicts:
#	ElvUI/Modules/Nameplates/Nameplates.lua
parents d6f488e3 5c0cebf0
......@@ -28,6 +28,7 @@ local UnitIsPVPSanctuary = UnitIsPVPSanctuary
local UnitIsUnit = UnitIsUnit
local UnitName = UnitName
local UnitReaction = UnitReaction
local UnitWidgetSet = UnitWidgetSet
local UnitSelectionType = UnitSelectionType
local UnitThreatSituation = UnitThreatSituation
local ShowBossFrameWhenUninteractable = ShowBossFrameWhenUninteractable
......@@ -498,7 +499,7 @@ function NP:PLAYER_ENTERING_WORLD()
NP.InstanceType = instanceType
if NP.db.units.PLAYER.enable and NP.db.units.PLAYER.useStaticPosition then
NP:UpdatePlate(_G.ElvNP_Player)
NP:NamePlateCallBack(_G.ElvNP_Player, 'NAME_PLATE_UNIT_ADDED', 'player')
end
end
......@@ -586,8 +587,7 @@ function NP:NamePlateCallBack(nameplate, event, unit)
unit = unit or nameplate.unit
local blizzPlate = nameplate:GetParent().UnitFrame
nameplate.blizzPlate = blizzPlate
nameplate.blizzPlate = nameplate:GetParent().UnitFrame
nameplate.className, nameplate.classFile, nameplate.classID = UnitClass(unit)
nameplate.classification = UnitClassification(unit)
nameplate.creatureType = UnitCreatureType(unit)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment