diff options
| author | Machiavelli <machiavelli.trinity@gmail.com> | 2011-12-13 14:05:17 +0100 |
|---|---|---|
| committer | Machiavelli <machiavelli.trinity@gmail.com> | 2011-12-13 14:05:17 +0100 |
| commit | d237134d901fa8762dd49460ec43794afd7d6327 (patch) | |
| tree | 0ea46a30686b0e7fe329ffdc074551072fcc0cf4 /src/server/game/Conditions/ConditionMgr.cpp | |
| parent | b8dec4ec35bae3cee6a3726276ec9ec99e08fe1b (diff) | |
| parent | 589f06710187713796f220f0a874b4447aaa6829 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -rwxr-xr-x | src/server/game/Conditions/ConditionMgr.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index bfefb3e4e76..cf349044042 100755 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -67,11 +67,8 @@ bool Condition::Meets(Player* player, Unit* invoker) break; } case CONDITION_ACHIEVEMENT: - { - AchievementEntry const* achievement = GetAchievementStore()->LookupEntry(mConditionValue1); - condMeets = player->GetAchievementMgr().HasAchieved(achievement); + condMeets = player->GetAchievementMgr().HasAchieved(mConditionValue1); break; - } case CONDITION_TEAM: condMeets = player->GetTeam() == mConditionValue1; break; |