From a254ce1a7cd94fe48943684c9649078f0c0a5129 Mon Sep 17 00:00:00 2001 From: ariel- Date: Sun, 24 Jul 2016 19:08:03 -0300 Subject: [PATCH] Core/Achievements: Fix merge fail introduced in 2bdcce17f892eafa15e0da7b1ba9601c22ecf833, additional requirements weren't being checked and completed criteria was being checked twice instead. Updates #51 --- .../game/Achievements/AchievementMgr.cpp | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 742f519901..de4c3e5634 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -2349,13 +2349,6 @@ bool AchievementMgr::CanUpdateCriteria(AchievementCriteriaEntry const* criter return false; } - if (!ConditionsSatisfied(criteria, referencePlayer)) - { - TC_LOG_TRACE("achievement", "CanUpdateCriteria: (Id: %u Type %s) Conditions not satisfied", - criteria->ID, AchievementGlobalMgr::GetCriteriaTypeString(criteria->type)); - return false; - } - if (IsCompletedCriteria(criteria, achievement)) { TC_LOG_TRACE("achievement", "CanUpdateCriteria: %s (Id: %u Type %s) Is Completed", @@ -2370,9 +2363,19 @@ bool AchievementMgr::CanUpdateCriteria(AchievementCriteriaEntry const* criter return false; } - // don't update already completed criteria - if (IsCompletedCriteria(criteria, achievement)) + if (!AdditionalRequirementsSatisfied(criteria, miscValue1, miscValue2, unit, referencePlayer)) + { + TC_LOG_TRACE("achievement", "CanUpdateCriteria: %s (Id: %u Type %s) Additional requirements not satisfied", + criteria->name, criteria->ID, AchievementGlobalMgr::GetCriteriaTypeString(criteria->type)); return false; + } + + if (!ConditionsSatisfied(criteria, referencePlayer)) + { + TC_LOG_TRACE("achievement", "CanUpdateCriteria: (Id: %u Type %s) Conditions not satisfied", + criteria->ID, AchievementGlobalMgr::GetCriteriaTypeString(criteria->type)); + return false; + } return true; }