aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/ArenaTeamHandler.cpp
diff options
context:
space:
mode:
authorVincent_Michael <Vincent_Michael@gmx.de>2014-01-18 01:03:24 +0100
committerVincent_Michael <Vincent_Michael@gmx.de>2014-01-18 01:03:24 +0100
commit3276a786cc35f4dddcceedcab84fba5e77b78e58 (patch)
treef1222842d0631edfa14a7d6d6d436884056bafbe /src/server/game/Handlers/ArenaTeamHandler.cpp
parent4027686b5b127cf9865a51648de16fa5a51a2682 (diff)
parentde7a43a157a8b78220319c26332a71db087e50c9 (diff)
Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/game/Handlers/ArenaTeamHandler.cpp')
-rw-r--r--src/server/game/Handlers/ArenaTeamHandler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Handlers/ArenaTeamHandler.cpp b/src/server/game/Handlers/ArenaTeamHandler.cpp
index 1ae185f7e42..2f27abc4814 100644
--- a/src/server/game/Handlers/ArenaTeamHandler.cpp
+++ b/src/server/game/Handlers/ArenaTeamHandler.cpp
@@ -85,9 +85,9 @@ void WorldSession::HandleArenaTeamCreateOpcode(WorldPacket & recvData)
recvData >> slot;
recvData >> iconcolor;
recvData >> bordercolor;
- recvData >> icon;
- recvData >> background;
recvData >> border;
+ recvData >> background;
+ recvData >> icon;
name = recvData.ReadString(recvData.ReadBits(8));
uint8 type = ArenaTeam::GetTypeBySlot(slot);