From 337dd0af22f6d3e5534bd11183439f976c67a5cb Mon Sep 17 00:00:00 2001
From: Tercio <Tercio@localhost>
Date: Thu, 16 Feb 2017 13:08:41 -0200
Subject: [PATCH] - Ticket #167 fix: Light of the Martyr self-damage now does
 reduce the healing done (following WCL method). - Fixed an issue where
 sometimes BeastMaster's Hati pet wasn't detected correctly.

---
 boot.lua                          | 11 ++++++-----
 classes/container_combatentes.lua | 10 +++++++---
 core/parser.lua                   | 13 +++++++++++++
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/boot.lua b/boot.lua
index e0f1a902..be2d401e 100644
--- a/boot.lua
+++ b/boot.lua
@@ -3,7 +3,7 @@
 
 		_ = nil
 		_detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0")
-		_detalhes.build_counter = 3370
+		_detalhes.build_counter = 3410
 		_detalhes.userversion = "v7.1.5." .. _detalhes.build_counter
 		_detalhes.realversion = 116 --core version
 		_detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")"
@@ -21,10 +21,11 @@ do
 	local Loc = LibStub ("AceLocale-3.0"):GetLocale ( "Details" )
 
 --[[
-|cFFFFFF00v7.1.5.3369.116 (|cFFFFCC00Feb 07th, 2016|r|cFFFFFF00)|r:\n\n
-|cFFFFFF00-|r Added custom display 'Dynamic Overall Damage' for mythic dungeons.\n\n
-|cFFFFFF00-|r Fix for Ticket #168: 'Auto Hide While [Not] Inside Instance is broken'.\n\n
-|cFFFFFF00-|r The bar truncate frame 'DetailsLeftTextAntiTruncate' is now created on Details! load instead on demand.\n\n
+|cFFFFFF00v7.1.5.3410.116 (|cFFFFCC00Feb 16th, 2016|r|cFFFFFF00)|r:\n\n
+|cFFFFFF00-|r Ticket #167 fix: Light of the Martyr self-damage now does reduce the healing done (following WCL method).\n\n
+|cFFFFFF00-|r Fixed an issue where sometimes BeastMaster's Hati pet wasn't detected correctly.\n\n
+
+
 
 
 
diff --git a/classes/container_combatentes.lua b/classes/container_combatentes.lua
index 064d4d27..3fb0be23 100644
--- a/classes/container_combatentes.lua
+++ b/classes/container_combatentes.lua
@@ -333,7 +333,7 @@
 				nome = nome_dele
 				dono_do_pet = self:PegarCombatente (dono_serial, dono_nome, dono_flag, true, nome)
 			end
-
+			
 			return nome, dono_do_pet
 		end	
 	end
@@ -349,8 +349,10 @@
 		local text1 = line1:GetText()
 		if (text1 and text1 ~= "") then
 			for playerName, _ in _pairs (_detalhes.tabela_vigente.raid_roster) do
+				local pName = playerName
+				playerName = playerName:gsub ("%-.*", "") --remove realm name
 				if (text1:find (playerName)) then
-					return find_pet_found_owner (playerName, serial, nome, flag, self)
+					return find_pet_found_owner (pName, serial, nome, flag, self)
 				end
 			end
 		end
@@ -358,8 +360,10 @@
 		local text2 = line2:GetText()
 		if (text2 and text2 ~= "") then
 			for playerName, _ in _pairs (_detalhes.tabela_vigente.raid_roster) do
+				local pName = playerName
+				playerName = playerName:gsub ("%-.*", "") --remove realm name
 				if (text2:find (playerName)) then
-					return find_pet_found_owner (playerName, serial, nome, flag, self)
+					return find_pet_found_owner (pName, serial, nome, flag, self)
 				end
 			end
 		end
diff --git a/core/parser.lua b/core/parser.lua
index 63c93af1..2cae140e 100644
--- a/core/parser.lua
+++ b/core/parser.lua
@@ -248,6 +248,19 @@
 		--> spirit link toten
 		if (spellid == 98021) then
 			return parser:SLT_damage (token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, spellid, spellname, spelltype, amount, overkill, school, resisted, blocked, absorbed, critical, glacing, crushing, isoffhand)
+			
+		--> Light of the Martyr - paladin spell which causes damage to the caster it self
+		elseif (spellid == 196917) then
+			local healingActor = healing_cache [who_name]
+			if (healingActor and healingActor.spells) then
+				local spell = healingActor.spells._ActorTable [spellid]
+				if (spell) then
+					healingActor.total = healingActor.total - (amount or 0)
+					spell.total = spell.total - (amount or 0)
+					return
+				end
+			end
+			return --> ignore this event
 		end
 		
 		if (is_using_spellId_override) then