aboutsummaryrefslogtreecommitdiff
path: root/src/game/ChannelHandler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/ChannelHandler.cpp')
-rw-r--r--src/game/ChannelHandler.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/ChannelHandler.cpp b/src/game/ChannelHandler.cpp
index 45cdf8c20b2..e3c10afe81f 100644
--- a/src/game/ChannelHandler.cpp
+++ b/src/game/ChannelHandler.cpp
@@ -24,9 +24,6 @@
#include "ObjectMgr.h" // for normalizePlayerName
#include "ChannelMgr.h"
-INSTANTIATE_SINGLETON_1( AllianceChannelMgr );
-INSTANTIATE_SINGLETON_1( HordeChannelMgr );
-
void WorldSession::HandleJoinChannel(WorldPacket& recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
@@ -48,8 +45,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)