diff --git a/classes/class_combat.lua b/classes/class_combat.lua index 2be03a3ed..054f2ea41 100644 --- a/classes/class_combat.lua +++ b/classes/class_combat.lua @@ -529,6 +529,12 @@ local segmentTypeToString = { --mythic dungeon local bIsMythicDungeon = self:IsMythicDungeon() if (bIsMythicDungeon) then + --check for for regular trash mythic plus segment for a quick exit + local mythicDungeonTrachInfo = self:GetMythicDungeonTrashInfo() + if (mythicDungeonTrachInfo) then + return DETAILS_SEGMENTTYPE_MYTHICDUNGEON_TRASH, DETAILS_SEGMENTTYPE_MYTHICDUNGEON + end + local mythicDungeonInfo = self:GetMythicDungeonInfo() local bIsMythicOverallSegment, segmentID, mythicLevel, EJID, mapID, zoneName, encounterID, encounterName, startedAt, endedAt, runID = Details:UnpackMythicDungeonInfo(mythicDungeonInfo) diff --git a/functions/mythicdungeon/mythicdungeon.lua b/functions/mythicdungeon/mythicdungeon.lua index ec2687d50..984bb4ddf 100644 --- a/functions/mythicdungeon/mythicdungeon.lua +++ b/functions/mythicdungeon/mythicdungeon.lua @@ -221,11 +221,11 @@ function DetailsMythicPlusFrame.EventListener.OnDetailsEvent(contextObject, even local mythicLevel = C_ChallengeMode.GetActiveKeystoneInfo() --just in case the combat get tagged as boss fight - Details.tabela_vigente.is_boss = nil + Details:GetCurrentCombat().is_boss = nil --tag the combat as mythic dungeon trash local zoneName, instanceType, difficultyID, difficultyName, maxPlayers, dynamicDifficulty, isDynamic, instanceMapID, instanceGroupSize = GetInstanceInfo() - Details.tabela_vigente.is_mythic_dungeon_trash = { + Details:GetCurrentCombat().is_mythic_dungeon_trash = { ZoneName = zoneName, MapID = instanceMapID, Level = Details.MythicPlus.Level, diff --git a/functions/slash.lua b/functions/slash.lua index 45da60ae4..2934b8aab 100644 --- a/functions/slash.lua +++ b/functions/slash.lua @@ -1297,20 +1297,6 @@ function SlashCmdList.DETAILS (msg, editbox) newCombat.is_trash = false Details:Msg("done merging, segments: " .. segmentsAdded .. ", total time: " .. DetailsFramework:IntegerToTimer(totalTime)) - --[[ --mythic+ debug - --tag the segment as mythic overall segment - newCombat.is_mythic_dungeon = { - MapID = _detalhes.MythicPlus.Dungeon, - StartedAt = _detalhes.MythicPlus.StartedAt, --the start of the run - EndedAt = _detalhes.MythicPlus.EndedAt, --the end of the run - SegmentID = "overall", --segment number within the dungeon - --EncounterID = encounterID, - --EncounterName = encounterName, - RunID = _detalhes.MythicPlus.RunID, - OverallSegment = true, - } - --]] - --set some data newCombat:SetStartTime(GetTime() - totalTime) newCombat:SetEndTime(GetTime())