aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-27 12:46:04 -0600
committermegamage <none@none>2009-03-27 12:46:04 -0600
commitd0a58f705f34a6831a242977b0059a03dba8b5a6 (patch)
tree44f83fc683678cf4c60ede4251676e1427e58930
parentd798162dca95ab281c1766d67f496404b0d4db87 (diff)
*Fix a crash.
--HG-- branch : trunk
-rw-r--r--src/game/ChatHandler.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp
index 4bb362a1c4e..7c7a55b0ff1 100644
--- a/src/game/ChatHandler.cpp
+++ b/src/game/ChatHandler.cpp
@@ -496,19 +496,20 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
{
Channel *chn = cMgr->GetChannel(channel,_player);
if(chn)
+ {
chn->Say(_player->GetGUID(),msg.c_str(),lang);
- if(chn->HasFlag(CHANNEL_FLAG_TRADE) ||
- chn->HasFlag(CHANNEL_FLAG_GENERAL) ||
- chn->HasFlag(CHANNEL_FLAG_CITY) ||
- chn->HasFlag(CHANNEL_FLAG_LFG))
- if(sWorld.getConfig(CONFIG_CHATLOG_SYSCHAN))
- sLog.outChat("[SYSCHAN] Player %s tells channel %s: %s",
+ if(chn->HasFlag(CHANNEL_FLAG_TRADE) ||
+ chn->HasFlag(CHANNEL_FLAG_GENERAL) ||
+ chn->HasFlag(CHANNEL_FLAG_CITY) ||
+ chn->HasFlag(CHANNEL_FLAG_LFG))
+ if(sWorld.getConfig(CONFIG_CHATLOG_SYSCHAN))
+ sLog.outChat("[SYSCHAN] Player %s tells channel %s: %s",
GetPlayer()->GetName(), chn->GetName().c_str(), msg.c_str());
- else
- if(sWorld.getConfig(CONFIG_CHATLOG_CHANNEL))
- sLog.outChat("[CHANNEL] Player %s tells channel %s: %s",
+ else if(sWorld.getConfig(CONFIG_CHATLOG_CHANNEL))
+ sLog.outChat("[CHANNEL] Player %s tells channel %s: %s",
GetPlayer()->GetName(), chn->GetName().c_str(), msg.c_str());
+ }
}
} break;