* merge

--HG--
branch : trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index de12e6ae7bd..e8967ef2f3e 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -7727,8 +7727,8 @@ bool PlayerCondition::Meets(Player const * player) const
         }
         case CONDITION_ACHIEVEMENT:
         {
-           AchievementEntry const* achievement = GetAchievementStore()->LookupEntry(value1);
-            return player->GetAchievementMgr().IsCompletedAchievement(value1);
+            AchievementEntry const* achievement = GetAchievementStore()->LookupEntry(value1);
+            return (achievement,1);
         }
         case CONDITION_TEAM:
             return player->GetTeam() == value1;