aboutsummaryrefslogtreecommitdiff
path: root/src/game/ChannelHandler.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2009-07-18 23:41:42 +0200
committerQAston <none@none>2009-07-18 23:41:42 +0200
commit53c62aceadc4d4359437a8bccbbe7993bda4e510 (patch)
tree8cded2a08b84e1aeb6a5762018148109e93bbac9 /src/game/ChannelHandler.cpp
parent5f3f62222670f70a0c278b76ce91601814da1f3f (diff)
parentc8342ca8ce3f49d1c53fa3bfb69f26197e032cc0 (diff)
*Merge.
--HG-- branch : trunk
Diffstat (limited to 'src/game/ChannelHandler.cpp')
-rw-r--r--src/game/ChannelHandler.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/ChannelHandler.cpp b/src/game/ChannelHandler.cpp
index 45cdf8c20b2..9706e5657e7 100644
--- a/src/game/ChannelHandler.cpp
+++ b/src/game/ChannelHandler.cpp
@@ -48,8 +48,11 @@ void WorldSession::HandleJoinChannel(WorldPacket& recvPacket)
recvPacket >> pass;
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+ {
+ cMgr->team = _player->GetTeam();
if(Channel *chn = cMgr->GetJoinChannel(channelname, channel_id))
chn->Join(_player->GetGUID(), pass.c_str());
+ }
}
void WorldSession::HandleLeaveChannel(WorldPacket& recvPacket)