aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
authorSubv <s.v.h21@hotmail.com>2012-12-24 09:00:07 -0500
committerSubv <s.v.h21@hotmail.com>2012-12-24 09:00:07 -0500
commit1d45bc0413ee0adb008ae7c74540150dca48eaf0 (patch)
treedc42a881374647a00f4ba3a2ea53a158996c01c7 /src/server/game
parentbba157109903c034f991315ba62fac91f4565011 (diff)
parentec6f7541b7b71b6948336de1a8e54ce36d58a918 (diff)
Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/game')
-rw-r--r--src/server/game/Battlegrounds/BattlegroundMgr.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp
index 1474440959d..141cdee531d 100644
--- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp
+++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp
@@ -173,8 +173,6 @@ void BattlegroundMgr::BuildBattlegroundStatusPacket(WorldPacket *data, Battlegro
data->WriteBit(playerGuid[5]);
data->WriteBit(playerGuid[2]);
- data->FlushBits();
-
data->WriteByteSeq(playerGuid[5]);
data->WriteByteSeq(playerGuid[6]);
data->WriteByteSeq(playerGuid[7]);
@@ -274,8 +272,6 @@ void BattlegroundMgr::BuildBattlegroundStatusPacket(WorldPacket *data, Battlegro
data->WriteBit(bgGuid[5]);
data->WriteBit(playerGuid[0]);
- data->FlushBits();
-
data->WriteByteSeq(bgGuid[6]);
data->WriteByteSeq(bgGuid[5]);
data->WriteByteSeq(bgGuid[7]);
@@ -346,7 +342,7 @@ void BattlegroundMgr::BuildBattlegroundStatusPacket(WorldPacket *data, Battlegro
data->WriteByteSeq(playerGuid[0]);
data->WriteByteSeq(playerGuid[3]);
- data->WriteByteSeq(playerGuid[2]);
+ data->WriteByteSeq(bgGuid[2]);
*data << uint32(bg->GetClientInstanceID()); // Client Instance ID or faction ?