Skip to content

Commit

Permalink
Core: Fix pull detection by yell ignoring noMultiBoss
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 authored Feb 29, 2024
1 parent 469e6a6 commit 909ea8d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions DBM-Core/DBM-Core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4530,9 +4530,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 909ea8d

Please sign in to comment.