From feb08b82853f61ea798339822e79460e69a60c7e Mon Sep 17 00:00:00 2001 From: oomshroom <160084940+oomshroom@users.noreply.github.com> Date: Sat, 20 Jul 2024 17:56:56 +0300 Subject: [PATCH] Core: Fix pull detection by yell ignoring noMultiBoss (#201) Fix logic error causing noMultiBoss set by DisableMultiBossPulls() to be ignored --- DBM-Core/DBM-Core.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DBM-Core/DBM-Core.lua b/DBM-Core/DBM-Core.lua index 1941a905..a27886a2 100644 --- a/DBM-Core/DBM-Core.lua +++ b/DBM-Core/DBM-Core.lua @@ -82,7 +82,7 @@ local function currentFullDate() end DBM = { - Revision = parseCurseDate("20240716165208"), + Revision = parseCurseDate("20240720155235"), DisplayVersion = "10.1.12 alpha", -- the string that is shown as version ReleaseRevision = releaseDate(2024, 02, 21) -- the date of the latest stable version that is available, optionally pass hours, minutes, and seconds for multiple releases in one day } @@ -4533,9 +4533,9 @@ do local combat = combatInfo[LastInstanceMapID] or combatInfo[LastInstanceZoneName] if dbmIsEnabled and combat then for _, v in ipairs(combat) do - if v.type == type and checkEntry(v.msgs, msg) or v.type == type .. "_regex" and checkExpressionList(v.msgs, msg) and not (#inCombat > 0 and v.noMultiBoss) then + if (v.type == type and checkEntry(v.msgs, msg) or v.type == type .. "_regex" and checkExpressionList(v.msgs, msg)) and not (#inCombat > 0 and v.noMultiBoss) then self:StartCombat(v.mod, 0, "MONSTER_MESSAGE") - elseif v.type == "combat_" .. type .. "find" and tContains(v.msgs, msg) or v.type == "combat_" .. type and checkEntry(v.msgs, msg) and not (#inCombat > 0 and v.noMultiBoss) then + elseif (v.type == "combat_" .. type .. "find" and tContains(v.msgs, msg) or v.type == "combat_" .. type and checkEntry(v.msgs, msg)) and not (#inCombat > 0 and v.noMultiBoss) then if IsInInstance() then--Indoor boss that uses both combat and message for combat, so in other words (such as hodir), don't require "target" of boss for yell like scanForCombat does for World Bosses self:StartCombat(v.mod, 0, "MONSTER_MESSAGE") else--World Boss