From b465fcfe71e673ff4b4a8e7651e314707f27dd10 Mon Sep 17 00:00:00 2001
From: mik1893 <michele.roscelli@gmail.com>
Date: Wed, 3 Aug 2016 08:48:47 +0100
Subject: [PATCH] Ensure team is switched before joining BG

---
 src/server/game/Handlers/BattleGroundHandler.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp
index 93d3d1766d..a482ab8d70 100644
--- a/src/server/game/Handlers/BattleGroundHandler.cpp
+++ b/src/server/game/Handlers/BattleGroundHandler.cpp
@@ -450,6 +450,9 @@ void WorldSession::HandleBattleFieldPortOpcode(WorldPacket &recvData)
                         teamId = TEAM_ALLIANCE;
                     else
                         teamId = TEAM_HORDE;
+
+                    _player->setTeamId(teamId);
+                    _player->setFaction(teamId == TEAM_ALLIANCE ? 1 : 2);
                 }
                 // [/AZTH]