Exiles/coa-details
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

Fixing last commit stuff

Browse Source
This commit is contained in:
Tercio Jose
2024-08-17 13:10:06 -03:00
committed by andrew6180
parent 6456547ab1
commit ff80c8c9c6
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/gears.lua
+5 -5
View File
@@ -788,6 +788,11 @@ Details222.Parser.EventFrame:RegisterEvent("PLAYER_REGEN_DISABLED")
Details222.Parser.EventFrame:SetScript("OnEvent", function(self, event, ...)
local instanceName, isntanceType = GetInstanceInfo()
if (isntanceType == "pvp" or isntanceType == "arena") then
Details222.parser_frame:SetScript("OnEvent", Details222.Parser.OnParserEventPVP)
return
end
if (isntanceType ~= "none") then
if (Details222.parser_frame:GetScript("OnEvent") ~= Details222.Parser.OnParserEvent) then
Details222.parser_frame:SetScript("OnEvent", Details222.Parser.OnParserEvent)
@@ -795,11 +800,6 @@ Details222.Parser.EventFrame:SetScript("OnEvent", function(self, event, ...)
return
end
if (isntanceType == "pvp" or isntanceType == "arena") then
Details222.parser_frame:SetScript("OnEvent", Details222.Parser.OnParserEventPVP)
return
end
if (event == "PLAYER_ENTERING_WORLD" or event == "ZONE_CHANGED_NEW_AREA") then
if (bConsiderGroupMembers) then
--check if any group member is in combat
core/parser.lua
+12 -12
View File
@@ -6025,29 +6025,29 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
end
function Details222.Parser.OnParserEventPVP(self, event, ...)
local time, token, hidding, who_serial, who_name, who_flags, who_flags2, target_serial, target_name, target_flags, target_flags2, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12 = CombatLogGetCurrentEventInfo(...)
local time, token, hidding, sourceGUID, sourceName, sourceFlags, sourceFlags2, targetGUID, targetName, targetFlags, targetFlags2, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12 = CombatLogGetCurrentEventInfo(...)
local func = token_list[token]
if (func) then
if (group_roster_name_cache[who_serial]) then
who_name = group_roster_name_cache[who_serial]
if (group_roster_name_cache[sourceGUID]) then
sourceName = group_roster_name_cache[sourceGUID]
else
if (who_serial:match("^Pl")) then
who_name = who_name:gsub("-%a+$", "")
group_roster_name_cache[who_serial] = who_name
if (sourceGUID:match("^Pl")) then
sourceName = sourceName:gsub("-%a+$", "")
group_roster_name_cache[sourceGUID] = sourceName
end
end
if (group_roster_name_cache[target_serial]) then
target_name = group_roster_name_cache[target_serial]
if (group_roster_name_cache[targetGUID]) then
targetName = group_roster_name_cache[targetGUID]
else
if (target_serial:match("^Pl")) then
target_name = target_name:gsub("-%a+$", "")
group_roster_name_cache[target_serial] = target_name
if (targetGUID:match("^Pl")) then
targetName = targetName:gsub("-%a+$", "")
group_roster_name_cache[targetGUID] = targetName
end
end
return func(nil, token, time, who_serial, who_name, who_flags, target_serial, target_name, target_flags, target_flags2, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12)
return func(nil, token, time, sourceGUID, sourceName, sourceFlags, targetGUID, targetName, targetFlags, targetFlags2, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12)
end
end