diff options
| -rw-r--r-- | src/server/game/Achievements/CriteriaHandler.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/server/game/Achievements/CriteriaHandler.cpp b/src/server/game/Achievements/CriteriaHandler.cpp index c8acd18671e..b917cb02cb4 100644 --- a/src/server/game/Achievements/CriteriaHandler.cpp +++ b/src/server/game/Achievements/CriteriaHandler.cpp @@ -1253,10 +1253,13 @@ bool CriteriaHandler::RequirementsSatisfied(Criteria const* criteria, uint64 mis return false; break; case CRITERIA_TYPE_WIN_BG: + case CRITERIA_TYPE_COMPLETE_BATTLEGROUND: + case CRITERIA_TYPE_DEATH_AT_MAP: if (!miscValue1 || criteria->Entry->Asset.MapID != referencePlayer->GetMapId()) return false; break; case CRITERIA_TYPE_KILL_CREATURE: + case CRITERIA_TYPE_KILLED_BY_CREATURE: if (!miscValue1 || criteria->Entry->Asset.CreatureID != miscValue1) return false; break; @@ -1270,11 +1273,6 @@ bool CriteriaHandler::RequirementsSatisfied(Criteria const* criteria, uint64 mis if (miscValue1 && miscValue1 != criteria->Entry->Asset.ZoneID) return false; break; - case CRITERIA_TYPE_COMPLETE_BATTLEGROUND: - case CRITERIA_TYPE_DEATH_AT_MAP: - if (!miscValue1 || referencePlayer->GetMapId() != criteria->Entry->Asset.MapID) - return false; - break; case CRITERIA_TYPE_DEATH: { if (!miscValue1) @@ -1295,10 +1293,6 @@ bool CriteriaHandler::RequirementsSatisfied(Criteria const* criteria, uint64 mis return false; break; } - case CRITERIA_TYPE_KILLED_BY_CREATURE: - if (!miscValue1 || miscValue1 != criteria->Entry->Asset.CreatureID) - return false; - break; case CRITERIA_TYPE_KILLED_BY_PLAYER: if (!miscValue1 || !unit || unit->GetTypeId() != TYPEID_PLAYER) return false; |