Skip to content

Commit

Permalink
Core: Fix pull detection by yell ignoring noMultiBoss (#201)
Browse files Browse the repository at this point in the history
Fix logic error causing noMultiBoss set by DisableMultiBossPulls() to be ignored
  • Loading branch information
oomshroom committed Jul 20, 2024
1 parent 76fff4c commit feb08b8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions DBM-Core/DBM-Core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit feb08b8

Please sign in to comment.