diff options
| author | Jeremy <Golrag@users.noreply.github.com> | 2023-12-29 14:12:15 +0100 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2024-01-09 12:26:52 +0100 |
| commit | d816fc100aa3791b0a865a2322f66ea3229c6661 (patch) | |
| tree | 71030c093193ca7ead5901cd8f576b6145fad3c6 /src/server/game/Achievements/CriteriaHandler.cpp | |
| parent | c545216960e68ff835a9fab1ed91711fb9e4a933 (diff) | |
Core/Battlegrounds: Clean up some Team/TeamId parameters to use enums instead of raw integer types (#29535)
* Fix criteria data type bg loss team score
(cherry picked from commit 1ef0c045202a6af33fb991f2ff765fa183ce976f)
Diffstat (limited to 'src/server/game/Achievements/CriteriaHandler.cpp')
| -rw-r--r-- | src/server/game/Achievements/CriteriaHandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Achievements/CriteriaHandler.cpp b/src/server/game/Achievements/CriteriaHandler.cpp index b5159e144b3..b9bb10c426f 100644 --- a/src/server/game/Achievements/CriteriaHandler.cpp +++ b/src/server/game/Achievements/CriteriaHandler.cpp @@ -362,7 +362,7 @@ bool CriteriaData::Meets(uint32 criteriaId, Player const* source, WorldObject co case CRITERIA_DATA_TYPE_T_TEAM: if (!target || target->GetTypeId() != TYPEID_PLAYER) return false; - return target->ToPlayer()->GetTeam() == Team.Team; + return target->ToPlayer()->GetTeam() == ::Team(Team.Team); case CRITERIA_DATA_TYPE_S_DRUNK: return Player::GetDrunkenstateByValue(source->GetDrunkValue()) >= DrunkenState(Drunk.State); case CRITERIA_DATA_TYPE_HOLIDAY: @@ -375,7 +375,7 @@ bool CriteriaData::Meets(uint32 criteriaId, Player const* source, WorldObject co if (!bg) return false; - uint32 score = bg->GetTeamScore(bg->GetPlayerTeam(source->GetGUID()) == TEAM_ALLIANCE ? TEAM_HORDE : TEAM_ALLIANCE); + uint32 score = bg->GetTeamScore(bg->GetPlayerTeam(source->GetGUID()) == ALLIANCE ? TEAM_HORDE : TEAM_ALLIANCE); return score >= BattlegroundScore.Min && score <= BattlegroundScore.Max; } case CRITERIA_DATA_TYPE_INSTANCE_SCRIPT: |