Skip to content

Commit

Permalink
Merge pull request #111 from Vysci/revert-105-patch-1
Browse files Browse the repository at this point in the history
Revert "Allowing heroic dungeons when filtering by level"
  • Loading branch information
Vysci authored Jul 6, 2021
2 parents 1ed9681 + 5c52e12 commit ca5c40d
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions LFGBulletinBoard/GroupBulletinBoard.lua
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +124,12 @@ function GBB.LevelRange(dungeon,short)
end

function GBB.FilterDungeon(dungeon, isHeroic, isRaid)
if dungeon == nil then return false end
if dungeon==nil then return false end
if isHeroic == nil then isHeroic = false end
if isRaid == nil then isRaid = false end

-- If the user is within the level range, or if they're max level and it's heroic.
local inLevelRange = (GBB.dungeonLevel[dungeon][1] <= GBB.UserLevel and GBB.UserLevel <= GBB.dungeonLevel[dungeon][2]) or (isHeroic and GBB.UserLevel == 70)

return GBB.DBChar["FilterDungeon"..dungeon] and
(isRaid or ((GBB.DBChar["HeroicOnly"] == false or isHeroic) and (GBB.DBChar["NormalOnly"] == false or isHeroic == false))) and
(GBB.DBChar.FilterLevel == false or inLevelRange)
return GBB.DBChar["FilterDungeon"..dungeon] and (isRaid or ((GBB.DBChar["HeroicOnly"] == false or isHeroic) and (GBB.DBChar["NormalOnly"] == false or isHeroic == false))) and
(GBB.DBChar.FilterLevel==false or (GBB.dungeonLevel[dungeon][1] <= GBB.UserLevel and GBB.UserLevel <= GBB.dungeonLevel[dungeon][2]))
end

function GBB.formatTime(sec)
Expand Down

0 comments on commit ca5c40d

Please sign in to comment.