diff options
| author | thenecromancer <none@none> | 2010-01-27 13:40:01 +0100 |
|---|---|---|
| committer | thenecromancer <none@none> | 2010-01-27 13:40:01 +0100 |
| commit | 6bca70a7770b7e04d84701927ab53c3f1c0804cf (patch) | |
| tree | 53135e4c7c93862da9038f682bdabc78714f5fbe | |
| parent | 2c81241bef8f47bc1845d880b872065139804ab9 (diff) | |
Fix Arena Teams on scoreboard being swapped
Fix Arena Unit Frames
--HG--
branch : trunk
| -rw-r--r-- | src/game/BattleGroundMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp index f36ddecb9e1..7948fd321d6 100644 --- a/src/game/BattleGroundMgr.cpp +++ b/src/game/BattleGroundMgr.cpp @@ -1278,7 +1278,7 @@ void BattleGroundMgr::BuildBattleGroundStatusPacket(WorldPacket *data, BattleGro *data << uint32(bg->GetMapId()); // map id *data << uint32(Time1); // time to bg auto leave, 0 at bg start, 120000 after bg end, milliseconds *data << uint32(Time2); // time from bg start, milliseconds - *data << uint8(bg->isArena() ? 0 : 1); // unk, 0 for arena matches, 1 for bg matches + *data << uint8(/*bg->isArena() ? 0 :*/ 1); // unk, possibly 0 == preparation phase, 1 == battle break; default: sLog.outError("Unknown BG status!"); @@ -1344,8 +1344,8 @@ void BattleGroundMgr::BuildPvpLogDataPacket(WorldPacket *data, BattleGround *bg) Player *plr = objmgr.GetPlayer(itr->first); uint32 team = bg->GetPlayerTeam(itr->first); if (!team && plr) - team = plr->GetTeam(); - *data << uint8(team == ALLIANCE ? 0 : 1); // green or yellow + team = plr->GetBGTeam(); + *data << uint8(team == ALLIANCE ? 1 : 0); // green or yellow } *data << (int32)itr->second->DamageDone; // damage done |