brues/Vanilla_MikScrollingBattleText
1
0
Fork 0
mirror of https://github.com/brues-code/Vanilla_MikScrollingBattleText.git synced 2026-10-05 21:20:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11 from toinetoine/master

Browse Source 
fixes lua errors in the chinese client
This commit is contained in:
AtheneGenesis
2018-11-15 22:44:12 +01:00
committed by GitHub
parent 4d75a5af69 4469495dbc
commit 9efd70bfee
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MikScrollingBattleText/MikCombatEventHelper.lua
+9 -9
View File
@@ -1367,7 +1367,9 @@ function MikCEH.ParseForIncomingSpellHeals(combatMessage)
-- Get overheal info.
eventData.Name = playerName
MikCEH.PopulateOverhealData(eventData); -- athenne add
if GetLocale() ~= "zhCN" then -- edge case for chinese client (unable to show overheal amount for hot casted on self by other)
MikCEH.PopulateOverhealData(eventData); -- athenne add
end
eventData.Name = capturedData.Name
-- Send the event.
@@ -1442,7 +1444,9 @@ function MikCEH.ParseForIncomingSpellHeals(combatMessage)
-- Get overheal info.
eventData.Name = UnitName("pet")
MikCEH.PopulateOverhealData(eventData); -- athenne add
if GetLocale() ~= "zhCN" then -- edge case for chinese client (unable to show overheal amount for hot casted on your pet by other)
MikCEH.PopulateOverhealData(eventData); -- athenne add
end
eventData.Name = capturedData.Name
-- Send the event.
@@ -3667,14 +3671,10 @@ function MikCEH.PopulateOverhealData(eventData)
if (unitID) then
local healthMissing = UnitHealthMax(unitID) - UnitHealth(unitID);
local overhealAmount = eventData.Amount - healthMissing;
-- DEFAULT_CHAT_FRAME:AddMessage("Health: "..UnitHealth(unitID))
-- DEFAULT_CHAT_FRAME:AddMessage("HealthMax: "..UnitHealthMax(unitID))
-- DEFAULT_CHAT_FRAME:AddMessage("Missing: "..healthMissing)
-- DEFAULT_CHAT_FRAME:AddMessage("Overheal: "..overhealAmount)
-- DEFAULT_CHAT_FRAME:AddMessage("Amount: "..eventData.Amount)
-- Check if any overhealing occured.
if (overhealAmount > 0) then
-- Check if any overhealing occured （note threshold is 100 because heals on non-group members
-- will show show max health 100 instead of the proper maximum health of the target)
if (overhealAmount > 0 and UnitHealthMax(unitID) > 100) then
eventData.PartialActionType = MikCEH.PARTIALACTIONTYPE_OVERHEAL;
eventData.PartialAmount = overhealAmount;
end