diff options
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -rwxr-xr-x | src/server/game/Conditions/ConditionMgr.cpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 7628906f0fc..ddf450d2d56 100755 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -279,16 +279,9 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) condMeets = player->HasTitle(ConditionValue1); break; } - case CONDITION_MAP_DIFFICULTY: + case CONDITION_SPAWNMASK: { - if (Unit* unit = object->ToUnit()) - { - if (unit->GetMap()->IsRaid()) - if (unit->GetMap()->Is25ManRaid() != ((ConditionValue1 & RAID_DIFFICULTY_MASK_25MAN) != 0)) - return false; - - condMeets = unit->GetMap()->GetSpawnMode() >= ConditionValue1; - } + condMeets = ((1 << object->GetMap()->GetSpawnMode()) & ConditionValue1); break; } default: @@ -442,7 +435,7 @@ uint32 Condition::GetSearcherTypeMaskForCondition() case CONDITION_TITLE: mask |= GRID_MAP_TYPE_MASK_PLAYER; break; - case CONDITION_MAP_DIFFICULTY: + case CONDITION_SPAWNMASK: mask |= GRID_MAP_TYPE_MASK_ALL; break; default: @@ -1857,11 +1850,11 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) } break; } - case CONDITION_MAP_DIFFICULTY: + case CONDITION_SPAWNMASK: { - if (cond->ConditionValue1 >= MAX_DIFFICULTY) + if (cond->ConditionValue1 > SPAWNMASK_RAID_ALL) { - sLog->outError(LOG_FILTER_SQL, "Map Difficulty condition has non existing map difficulty in value1 (%u), skipped", cond->ConditionValue1); + sLog->outError(LOG_FILTER_SQL, "SpawnMask condition has non existing SpawnMask in value1 (%u), skipped", cond->ConditionValue1); return false; } break; |