aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMeji <alvaro.megias@outlook.com>2024-04-01 20:32:08 +0200
committerOvahlord <dreadkiller@gmx.de>2024-05-28 16:32:11 +0200
commita06f071f988e1c40ddd9b12b4ff401426dea8423 (patch)
tree09849a2eebd9fa433c557fbef021cd530345e098 /src
parent0426f8df6f5e60d24f78e14363f043c7a5b72e72 (diff)
Core/Conditions: Fixed evaluation of CurrentPvpFaction outside arenas or battlegrounds (#29882)
(cherry picked from commit 47e4bf06d395cd92a90555594dd1264e628f10e0)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Conditions/ConditionMgr.cpp2
1 files changed, 1 insertions, 1 deletions
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;