From 490b6f88d4ceae982da8877e50b20070a8f4f978 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 8 Jul 2022 00:35:24 +0200 Subject: Core/Conditions: Implemented PlayerCondition::CurrentPvpFaction --- src/server/game/Conditions/ConditionMgr.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src') diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index d40dfef63e1..080dd528b62 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -3042,6 +3042,18 @@ bool ConditionMgr::IsPlayerMeetingCondition(Player const* player, PlayerConditio } } + if (condition->CurrentPvpFaction) + { + int8 team; + if (player->GetMap()->IsBattlegroundOrArena()) + team = player->m_playerData->ArenaFaction; + else + team = player->GetTeamId(); + + if (condition->CurrentPvpFaction - 1 != team) + return false; + } + if (condition->PvpMedal && !((1 << (condition->PvpMedal - 1)) & *player->m_activePlayerData->PvpMedals)) return false; -- cgit v1.2.3