From a06f071f988e1c40ddd9b12b4ff401426dea8423 Mon Sep 17 00:00:00 2001
From: Meji <alvaro.megias@outlook.com>
Date: Mon, 1 Apr 2024 20:32:08 +0200
Subject: Core/Conditions: Fixed evaluation of CurrentPvpFaction outside arenas
 or battlegrounds (#29882)

(cherry picked from commit 47e4bf06d395cd92a90555594dd1264e628f10e0)
---
 src/server/game/Conditions/ConditionMgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index 914d38885cf..236c0f9d269 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -2986,7 +2986,7 @@ bool ConditionMgr::IsPlayerMeetingCondition(Player const* player, PlayerConditio
         if (player->GetMap()->IsBattlegroundOrArena())
             team = player->m_playerData->ArenaFaction;
         else
-            team = player->GetTeamId();
+            team = player->GetTeamId() == TEAM_ALLIANCE ? 1 : 0;
 
         if (condition->CurrentPvpFaction - 1 != team)
             return false;
-- 
cgit v1.2.3