diff options
author | Jeremy <Golrag@users.noreply.github.com> | 2023-12-29 14:12:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-29 14:12:15 +0100 |
commit | 1ef0c045202a6af33fb991f2ff765fa183ce976f (patch) | |
tree | 4a2744ed72b4e66935341c4d1ee3b01e5d80f0e1 /src/server/game/Achievements/CriteriaHandler.cpp | |
parent | fb64d7fe8efe5ecba40123cdc96195d3ca52d7c0 (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
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 94af759f183..08fc5d69c14 100644 --- a/src/server/game/Achievements/CriteriaHandler.cpp +++ b/src/server/game/Achievements/CriteriaHandler.cpp @@ -365,7 +365,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: @@ -378,7 +378,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: |