From ff7e37f7081c005abdac2762d0f4e49d15a9282c Mon Sep 17 00:00:00 2001 From: Hondacrx Date: Sun, 4 Aug 2024 16:35:43 -0400 Subject: [PATCH] Core/Conditions: Fixed evaluation of CurrentPvpFaction outside arenas or battlegrounds Port From (https://github.com/TrinityCore/TrinityCore/commit/47e4bf06d395cd92a90555594dd1264e628f10e0) --- Source/Game/Conditions/ConditionManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Game/Conditions/ConditionManager.cs b/Source/Game/Conditions/ConditionManager.cs index c420575b2..87484f915 100644 --- a/Source/Game/Conditions/ConditionManager.cs +++ b/Source/Game/Conditions/ConditionManager.cs @@ -2089,7 +2089,7 @@ namespace Game if (player.GetMap().IsBattlegroundOrArena()) team = player.m_playerData.ArenaFaction; else - team = (byte)player.GetTeamId(); + team = (byte)(player.GetTeamId() == BattleGroundTeamId.Alliance ? 1 : 0); if (condition.CurrentPvpFaction - 1 != team) return false;