From a7d322397f32f3b0f34f57b95dc31a428057723a Mon Sep 17 00:00:00 2001
From: "Johnny C. Lam" <jlam88@gmail.com>
Date: Sun, 28 Oct 2012 22:01:50 +0000
Subject: [PATCH] Fix ticket 186 & re-enable CLEU event handler for *target
 unit IDs.

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@629 d5049fe3-3747-40f7-a4b5-f36d6801af5f
---
 OvaleAura.lua |   23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/OvaleAura.lua b/OvaleAura.lua
index 045dc55..141f8b3 100644
--- a/OvaleAura.lua
+++ b/OvaleAura.lua
@@ -34,7 +34,7 @@ local GetSpecialization, GetShapeshiftForm, UnitAura = GetSpecialization, GetSha
 function OvaleAura:OnEnable()
 	self.playerGUID = UnitGUID("player")
 	self:RegisterEvent("ACTIVE_TALENT_GROUP_CHANGED")
-	--self:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
+	self:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
 	self:RegisterEvent("PLAYER_ENTERING_WORLD")
 	self:RegisterEvent("UNIT_AURA")
 	self:RegisterEvent("UPDATE_SHAPESHIFT_FORM")
@@ -43,7 +43,7 @@ end
 
 function OvaleAura:OnDisable()
 	self:UnregisterEvent("ACTIVE_TALENT_GROUP_CHANGED")
-	--self:UnregisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
+	self:UnregisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
 	self:UnregisterEvent("PLAYER_ENTERING_WORLD")
 	self:UnregisterEvent("UNIT_AURA")
 	self:UnregisterEvent("UPDATE_SHAPESHIFT_FORM")
@@ -93,13 +93,11 @@ function OvaleAura:PLAYER_ENTERING_WORLD(event)
 end
 
 function OvaleAura:UNIT_AURA(event, unitId)
-	local guid
 	if unitId == "player" then
-		guid = self.playerGUID
+		self:UpdateAuras("player", self.playerGUID)
 	else
-		guid = UnitGUID(unitId)
+		self:UpdateAuras(unitId)
 	end
-	self:UpdateAuras(unitId, guid)
 end
 
 function OvaleAura:UPDATE_SHAPESHIFT_FORM(event)
@@ -175,7 +173,9 @@ function OvaleAura:UpdateAuras(unitId, unitGUID)
 	local hateHero
 	local hateClasse
 	local damageMultiplier
-	
+
+	if not unitId then return end
+
 	if unitId == "player" then
 		hateBase = GetCombatRatingBonus(18)
 		hateCommune = 0
@@ -186,12 +186,11 @@ function OvaleAura:UpdateAuras(unitId, unitGUID)
 		damageMultiplier = 1
 	end
 		
+	if not unitGUID and unitId == "player" then
+		unitGUID = self.playerGUID
+	end
 	if not unitGUID then
-		if unitId == "player" then
-			unitGUID = self.playerGUID
-		else
-			unitGUID = UnitGUID(unitId)
-		end
+		unitGUID = UnitGUID(unitId)
 	end
 
 	if not self.aura[unitGUID] then
-- 
1.7.9.5