aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Conditions/ConditionMgr.cpp
diff options
context:
space:
mode:
authorNay <dnpd.dd@gmail.com>2012-09-19 00:02:25 +0100
committerNay <dnpd.dd@gmail.com>2012-09-19 00:02:25 +0100
commit863229afbef7dfeac1cf487d4c9b0a94f4042786 (patch)
treeb70507a94e0b8bd1de226405d0d6059c450ff7a6 /src/server/game/Conditions/ConditionMgr.cpp
parent23961d0dce22e234e62f116469f04bb62d8986a7 (diff)
parent92119c9c38ea81ef2d3dc7f2db2093e681f05e8b (diff)
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
-rwxr-xr-xsrc/server/game/Conditions/ConditionMgr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index ddf450d2d56..546c4f303b2 100755
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -83,7 +83,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo)
case CONDITION_ACHIEVEMENT:
{
if (Player* player = object->ToPlayer())
- condMeets = player->GetAchievementMgr().HasAchieved(ConditionValue1);
+ condMeets = player->HasAchieved(ConditionValue1);
break;
}
case CONDITION_TEAM: