From ace353d088deac32bbdf178aff9b453b434541cc Mon Sep 17 00:00:00 2001
From: Brian <runningnak3d@gmail.com>
Date: Sun, 14 Mar 2010 16:32:04 -0600
Subject: * merge

--HG--
branch : trunk
---
 src/game/ObjectMgr.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/game/ObjectMgr.cpp')

diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index e8967ef2f3e..de12e6ae7bd 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 (achievement,1);
+           AchievementEntry const* achievement = GetAchievementStore()->LookupEntry(value1);
+            return player->GetAchievementMgr().IsCompletedAchievement(value1);
         }
         case CONDITION_TEAM:
             return player->GetTeam() == value1;
-- 
cgit v1.2.3