From 6f0aa96c50933ebd39491abf135fc34f92a98f23 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sat, 9 Jul 2022 12:38:24 -0400 Subject: [PATCH] Core/Conditions: Implemented PlayerCondition::CurrentPvpFaction Port From (https://github.com/TrinityCore/TrinityCore/commit/490b6f88d4ceae982da8877e50b20070a8f4f978) --- Source/Game/Conditions/ConditionManager.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Source/Game/Conditions/ConditionManager.cs b/Source/Game/Conditions/ConditionManager.cs index bc08c4176..fae24c70f 100644 --- a/Source/Game/Conditions/ConditionManager.cs +++ b/Source/Game/Conditions/ConditionManager.cs @@ -2111,6 +2111,18 @@ namespace Game } } + if (condition.CurrentPvpFaction != 0) + { + byte team; + if (player.GetMap().IsBattlegroundOrArena()) + team = player.m_playerData.ArenaFaction; + else + team = (byte)player.GetTeamId(); + + if (condition.CurrentPvpFaction - 1 != team) + return false; + } + if (condition.PvpMedal != 0 && !Convert.ToBoolean((1 << (condition.PvpMedal - 1)) & player.m_activePlayerData.PvpMedals)) return false;