diff options
Diffstat (limited to 'src/server/game/Conditions/DisableMgr.cpp')
| -rwxr-xr-x | src/server/game/Conditions/DisableMgr.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index 9b065729b88..a209d9b6cf6 100755 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -60,7 +60,6 @@ void LoadDisables() if (!result) { sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 disables. DB table `disables` is empty!"); - return; } @@ -134,10 +133,12 @@ void LoadDisables() case MAP_INSTANCE: case MAP_RAID: if (flags & DUNGEON_STATUSFLAG_HEROIC && !GetMapDifficultyData(entry, DUNGEON_DIFFICULTY_HEROIC)) - isFlagInvalid = true; - else if (flags & RAID_STATUSFLAG_10MAN_HEROIC && !GetMapDifficultyData(entry, RAID_DIFFICULTY_10MAN_HEROIC)) - isFlagInvalid = true; - else if (flags & RAID_STATUSFLAG_25MAN_HEROIC && !GetMapDifficultyData(entry, RAID_DIFFICULTY_25MAN_HEROIC)) + flags -= DUNGEON_STATUSFLAG_HEROIC; + if (flags & RAID_STATUSFLAG_10MAN_HEROIC && !GetMapDifficultyData(entry, RAID_DIFFICULTY_10MAN_HEROIC)) + flags -= RAID_STATUSFLAG_10MAN_HEROIC; + if (flags & RAID_STATUSFLAG_25MAN_HEROIC && !GetMapDifficultyData(entry, RAID_DIFFICULTY_25MAN_HEROIC)) + flags -= RAID_STATUSFLAG_25MAN_HEROIC; + if (!flags) isFlagInvalid = true; break; case MAP_BATTLEGROUND: @@ -229,7 +230,6 @@ void LoadDisables() while (result->NextRow()); sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u disables in %u ms", total_count, GetMSTimeDiffToNow(oldMSTime)); - } void CheckQuestDisables() @@ -240,7 +240,6 @@ void CheckQuestDisables() if (!count) { sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Checked 0 quest disables."); - return; } @@ -260,7 +259,6 @@ void CheckQuestDisables() } sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Checked %u quest disables in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); - } bool IsDisabledFor(DisableType type, uint32 entry, Unit const* unit, uint8 flags) |